Move enable/disable commands to /usr/sbin.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@4445 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 64e2370640faa8c46a2ae62b15c05ba9db0948fc..519024995ee08a3b5436ee30062f45d7e43ad76f 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,7 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.22
 
+       - Added Spanish man pages (STR #963)
        - Fixed the order of comparisons in the client.conf
          reading code (STR #971)
        - cupsLangGet() incorrectly set the current locale (STR

diff --git a/CHANGES.txt b/CHANGES.txt
index fdcd57e42cc7b88cd2c84b5f3a2a902936d1c9f5..65f1504f03b6a8ce13cb6108b5a4cb11ae28cca9 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,10 @@
-CHANGES.txt - 07/30/2004
+CHANGES.txt - 10/20/2004
 ------------------------
 
 CHANGES IN CUPS V1.2.0b1
 
+       - Moved enable and disable commands to sbindir to be
+         consistent.
        - Updated pdftops filter to Xpdf 3.00.03.
        - Added new cupsRasterInterpretPPD() function for RIP
          filters to setup the raster page header from

diff --git a/cups.list.in b/cups.list.in
index 69d93c9810f516582e609fdb8953af63121fd282..5037aa6e38b2e07c8876cf67ebc3d3ef7a1b37c1 100644 (file)
--- a/cups.list.in
+++ b/cups.list.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list.in,v 1.13.2.25 2004/06/29 13:15:08 mike Exp $"
+# "$Id: cups.list.in,v 1.13.2.26 2004/10/20 19:55:50 mike Exp $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
@@ -151,14 +151,13 @@ f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp
 f 0555 root sys $SERVERBIN/filter/texttops filter/texttops
 
 # Admin commands
-d 0555 root sys $BINDIR -
-l 0555 root sys $BINDIR/disable $SBINDIR/accept
-l 0555 root sys $BINDIR/enable $SBINDIR/accept
+d 0555 root sys $SBINDIR -
+l 0555 root sys $SBINDIR/disable accept
+l 0555 root sys $SBINDIR/enable accept
 l 0555 root sys $LIBDIR/accept $SBINDIR/accept
 d 0555 root sys $LIBDIR -
 l 0555 root sys $LIBDIR/lpadmin $SBINDIR/lpadmin
 l 0555 root sys $LIBDIR/reject accept
-d 0555 root sys $SBINDIR -
 f 0555 root sys $SBINDIR/accept systemv/accept
 f 0555 root sys $SBINDIR/cupsaddsmb systemv/cupsaddsmb
 f 0555 root sys $SBINDIR/lpadmin systemv/lpadmin
@@ -172,6 +171,7 @@ l 0555 root sys /usr/etc/lpc $SBINDIR/lpc
 %system all
 
 # User commands
+d 0555 root sys $BINDIR -
 f 0555 root sys $BINDIR/cancel systemv/cancel
 f 0555 root sys $BINDIR/cupstestppd systemv/cupstestppd
 f 0555 root sys $BINDIR/lp systemv/lp
@@ -403,5 +403,5 @@ f 0444 root sys $AMANDIR/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.man
 i 0555 root sys cups cups.sh
 
 #
-# End of "$Id: cups.list.in,v 1.13.2.25 2004/06/29 13:15:08 mike Exp $".
+# End of "$Id: cups.list.in,v 1.13.2.26 2004/10/20 19:55:50 mike Exp $".
 #

diff --git a/systemv/Makefile b/systemv/Makefile
index 57cdfd4dd2eb080cf097b86fda0731f3c0d96492..da6f15aea7be3c9c692d200b4f00ee996ab8a8de 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.23.2.9 2004/08/11 14:11:07 mike Exp $"
+# "$Id: Makefile,v 1.23.2.10 2004/10/20 19:55:50 mike Exp $"
 #
 #   System V commands makefile for the Common UNIX Printing System (CUPS).
 #
@@ -70,10 +70,10 @@ install:    all
        $(INSTALL_DIR) $(BINDIR)
        $(INSTALL_BIN) cancel $(BINDIR)
        $(INSTALL_BIN) cupstestppd $(SBINDIR)
-       $(RM) $(BINDIR)/disable
-       $(LN) ../sbin/accept $(BINDIR)/disable
-       $(RM) $(BINDIR)/enable
-       $(LN) ../sbin/accept $(BINDIR)/enable
+       $(RM) $(SBINDIR)/disable
+       $(LN) accept $(SBINDIR)/disable
+       $(RM) $(SBINDIR)/enable
+       $(LN) accept $(SBINDIR)/enable
        $(INSTALL_BIN) lp $(BINDIR)
        $(INSTALL_BIN) lpoptions $(BINDIR)
        $(INSTALL_BIN) lpstat $(BINDIR)
@@ -194,5 +194,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.23.2.9 2004/08/11 14:11:07 mike Exp $".
+# End of "$Id: Makefile,v 1.23.2.10 2004/10/20 19:55:50 mike Exp $".
 #