Rename accept sources to cupsaccept.

Install man page symlinks from cupsaccept to accept and reject.

Update packaging files.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@7992 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/man/Makefile b/man/Makefile
index 65572e0fcf206552e3a532203625d94eeb0c0a06..0a6330852a9cc3e7deedc7a6efe345a969019349 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -150,8 +150,10 @@ install-data: all
                echo Installing $$file in $(AMANDIR)/man$(MAN8DIR)...; \
                $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8DIR); \
        done
-       $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsreject.$(MAN8EXT)
-       $(LN) cupsaccept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsreject.$(MAN8EXT)
+       for file in accept cupsreject reject; do \
+               $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \
+               $(LN) cupsaccept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \
+       done
        $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
        $(LN) cupsenable.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
 
@@ -197,6 +199,8 @@ uninstall:
        for file in $(MAN8); do \
                $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file; \
        done
+       $(RM) $(AMANDIR)/man$(MAN8DIR)/accept.$(MAN8EXT)
+       $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsreject.$(MAN8EXT)
        $(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT)
        $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
        -$(RMDIR) $(AMANDIR)/man$(MAN8DIR)

diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index 22cdbf679d8a519eaa8036239d4aac0679480d64..b4aa5ae4aaa30c28293f48e75c37d3a81d103859 100644 (file)
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -325,15 +325,15 @@ f 0755 root sys $SERVERBIN/daemon/cups-lpd scheduler/cups-lpd
 
 # Admin commands
 d 0755 root sys $BINDIR -
-l 0755 root sys $BINDIR/enable $SBINDIR/accept
-l 0755 root sys $LIBDIR/accept $SBINDIR/accept
-l 0755 root sys $BINDIR/disable $SBINDIR/accept
+l 0755 root sys $BINDIR/enable $SBINDIR/cupsaccept
+l 0755 root sys $BINDIR/disable $SBINDIR/cupsaccept
 d 0755 root sys $LIBDIR -
+l 0755 root sys $LIBDIR/accept $SBINDIR/cupsaccept
 l 0755 root sys $LIBDIR/lpadmin $SBINDIR/lpadmin
-l 0755 root sys $LIBDIR/reject accept
+l 0755 root sys $LIBDIR/reject $SBINDIR/cupsaccept
 d 0755 root sys $SBINDIR -
-f 0755 root sys $SBINDIR/accept systemv/accept
-l 0755 root sys $SBINDIR/cupsaccept accept
+l 0755 root sys $SBINDIR/accept cupsaccept
+f 0755 root sys $SBINDIR/cupsaccept systemv/cupsaccept
 f 0755 root sys $SBINDIR/cupsaddsmb systemv/cupsaddsmb
 f 0755 root sys $SBINDIR/cupsctl systemv/cupsctl
 l 0755 root sys $SBINDIR/cupsdisable accept
@@ -343,7 +343,7 @@ f 0755 root sys $SBINDIR/lpadmin systemv/lpadmin
 f 0755 root sys $SBINDIR/lpc berkeley/lpc
 f 0755 root sys $SBINDIR/lpinfo systemv/lpinfo
 f 0755 root sys $SBINDIR/lpmove systemv/lpmove
-l 0755 root sys $SBINDIR/reject accept
+l 0755 root sys $SBINDIR/reject cupsaccept
 
 %system irix
 l 0755 root sys /usr/etc/lpc $SBINDIR/lpc
@@ -734,6 +734,7 @@ f 0644 root sys $MANDIR/man7/filter.$MAN7EXT man/filter.$MAN7EXT
 f 0644 root sys $MANDIR/man7/rastertoescpx.$MAN7EXT man/rastertoescpx.$MAN7EXT
 f 0644 root sys $MANDIR/man7/rastertopclx.$MAN7EXT man/rastertopclx.$MAN7EXT
 
+l 0644 root sys $AMANDIR/man$MAN8DIR/accept.$MAN8EXT cupsaccept.$MAN8EXT
 f 0644 root sys $AMANDIR/man$MAN8DIR/cupsaccept.$MAN8EXT man/cupsaccept.$MAN8EXT
 l 0644 root sys $AMANDIR/man$MAN8DIR/cupsreject.$MAN8EXT cupsaccept.$MAN8EXT
 f 0644 root sys $AMANDIR/man$MAN8DIR/cupsaddsmb.$MAN8EXT man/cupsaddsmb.$MAN8EXT
@@ -743,10 +744,13 @@ f 0644 root sys $AMANDIR/man$MAN8DIR/cups-polld.$MAN8EXT man/cups-polld.$MAN8EXT
 f 0644 root sys $AMANDIR/man$MAN8DIR/cupsd.$MAN8EXT man/cupsd.$MAN8EXT
 f 0644 root sys $AMANDIR/man$MAN8DIR/cupsenable.$MAN8EXT man/cupsenable.$MAN8EXT
 l 0644 root sys $AMANDIR/man$MAN8DIR/cupsdisable.$MAN8EXT cupsenable.$MAN8EXT
+l 0644 root sys $AMANDIR/man$MAN8DIR/disable.$MAN8EXT cupsenable.$MAN8EXT
+l 0644 root sys $AMANDIR/man$MAN8DIR/enable.$MAN8EXT cupsenable.$MAN8EXT
 f 0644 root sys $AMANDIR/man$MAN8DIR/lpadmin.$MAN8EXT man/lpadmin.$MAN8EXT
 f 0644 root sys $AMANDIR/man$MAN8DIR/lpc.$MAN8EXT man/lpc.$MAN8EXT
 f 0644 root sys $AMANDIR/man$MAN8DIR/lpinfo.$MAN8EXT man/lpinfo.$MAN8EXT
 f 0644 root sys $AMANDIR/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.$MAN8EXT
+l 0644 root sys $AMANDIR/man$MAN8DIR/reject.$MAN8EXT cupsaccept.$MAN8EXT
 
 %subpackage devel
 f 0644 root sys $MANDIR/man1/cups-config.$MAN1EXT man/cups-config.$MAN1EXT

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 1be9e6d300bf11c77da86840cf51e19b830ff7f0..a3bf96277303fbd2852ff5e2b48cd7bf921fcf8d 100644 (file)
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -287,11 +287,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/man/man8
 /usr/share/man/man8/accept.8.gz
 /usr/share/man/man8/cupsaddsmb.8.gz
+/usr/share/man/man8/cupsaccept.8.gz
 /usr/share/man/man8/cupsctl.8.gz
 /usr/share/man/man8/cupsfilter.8.gz
 /usr/share/man/man8/cupsd.8.gz
 /usr/share/man/man8/cupsdisable.8.gz
 /usr/share/man/man8/cupsenable.8.gz
+/usr/share/man/man8/cupsreject.8.gz
 /usr/share/man/man8/cups-deviced.8.gz
 /usr/share/man/man8/cups-driverd.8.gz
 /usr/share/man/man8/cups-polld.8.gz

diff --git a/systemv/Dependencies b/systemv/Dependencies
index 69e3912b924f3bfae87fa7682cc618cdf1f6595e..79765c4b9b1dd404c8ee8e8bd3bf10bce9bad4e4 100644 (file)
--- a/systemv/Dependencies
+++ b/systemv/Dependencies
@@ -1,13 +1,13 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-accept.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-accept.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-accept.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
-accept.o: ../cups/transcode.h
 cancel.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
 cancel.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 cancel.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
 cancel.o: ../cups/transcode.h
+cupsaccept.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
+cupsaccept.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+cupsaccept.o: ../cups/array.h ../cups/file.h ../cups/language.h
+cupsaccept.o: ../cups/i18n.h ../cups/transcode.h
 cupsaddsmb.o: ../cups/string.h ../config.h ../cups/adminutil.h ../cups/cups.h
 cupsaddsmb.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
 cupsaddsmb.o: ../cups/array.h ../cups/file.h ../cups/language.h

diff --git a/systemv/Makefile b/systemv/Makefile
index fb46f8f86788e7a2f38e389e01d90b872d813eed..d1c46fe670715db0f7556b358c324efeeddc9055 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -15,9 +15,9 @@
 
 include ../Makedefs
 
-TARGETS        =       accept cancel cupsaddsmb cupsctl cupstestdsc cupstestppd \
+TARGETS        =       cancel cupsaccept cupsaddsmb cupsctl cupstestdsc cupstestppd \
                lp lpadmin lpinfo lpmove lpoptions lppasswd lpstat
-OBJS   =       accept.o cancel.o cupsaddsmb.o cupsctl.o cupstestdsc.o \
+OBJS   =       cancel.o cupsaccept.o cupsaddsmb.o cupsctl.o cupstestdsc.o \
                cupstestppd.o lp.o lpadmin.o lpinfo.o lpmove.o lpoptions.o \
                lppasswd.o lpstat.o
 
@@ -49,7 +49,7 @@ unittests:
 
 clean:
        $(RM) $(OBJS) $(TARGETS)
-       $(RM) cupsaccept cupsdisable cupsenable cupsreject reject
+       $(RM) accept cupsdisable cupsenable cupsreject reject
 
 
 #
@@ -153,27 +153,25 @@ uninstall:
 
 
 #
-# accept
+# cancel
 #
 
-accept:        accept.o ../cups/$(LIBCUPS)
+cancel:        cancel.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o accept accept.o $(LIBS)
-       $(RM) cupsaccept cupsenable cupsdisable cupsreject reject
-       $(LN) accept reject
-       $(LN) accept cupsaccept
-       $(LN) accept cupsenable
-       $(LN) accept cupsdisable
-       $(LN) accept cupsreject
+       $(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS)
 
 
 #
-# cancel
+# cupsaccept
 #
 
-cancel:        cancel.o ../cups/$(LIBCUPS)
+cupsaccept:    cupsaccept.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS)
+       $(CC) $(LDFLAGS) -o cupsaccept cupsaccept.o $(LIBS)
+       for file in accept cupsenable cupsdisable cupsreject reject; do \
+               $(RM) $$file; \
+               $(LN) cupsaccept $$file; \
+       done
 
 
 #

diff --git a/systemv/accept.c b/systemv/cupsaccept.c
similarity index 100%
rename from systemv/accept.c
rename to systemv/cupsaccept.c