[Pkg-cups-devel] r326 - in cupsys/branches/cups-1.2/debian: local

[Martin Pitt]

Author: mpitt
Date: Mon Jul 24 08:55:45 2006
New Revision: 326

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/local/browsing_status
   cupsys/branches/cups-1.2/debian/local/enable_browsing

Log:
* debian/local/{enable_browsing,browsing_status}: Adapt to single-file
  configuration file style.

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Mon Jul 24 08:55:45 2006
@@ -25,8 +25,10 @@
     PPD base path.
   * debian/cupsys.examples: Do not ship .svn files (upstream Makefiles install
     them).
+  * debian/local/{enable_browsing,browsing_status}: Adapt to single-file
+    configuration file style.
 
- -- Martin Pitt <mpitt at debian.org>  Mon, 24 Jul 2006 10:14:37 +0200
+ -- Kenshi Muto <kmuto at debian.org>  Mon, 24 Jul 2006 10:55:22 +0200
 
 cupsys (1.2.1-4) unstable; urgency=medium
 

Modified: cupsys/branches/cups-1.2/debian/local/browsing_status
==============================================================================
--- cupsys/branches/cups-1.2/debian/local/browsing_status	(original)
+++ cupsys/branches/cups-1.2/debian/local/browsing_status	Mon Jul 24 08:55:45 2006
@@ -10,18 +10,14 @@
 # 2: the configuration was adapted manually; in this case enable_browsing cannot
 #    be used
 
-MAINCONF=/etc/cups/cupsd.conf
-BROWSECONF=/etc/cups/cups.d/browse.conf
+CONF=/etc/cups/cupsd.conf
 
-[ -f $MAINCONF -a -f $BROWSECONF ] || exit 2
+[ -f $CONF ] || exit 2
 
-# if BROWSECONF is not included -> custom
-egrep -qi "^[[:space:]]*Include[[:space:]]+($BROWSECONF|$(basename $BROWSECONF))[[:space:]]*(#.*)?\$" $MAINCONF || exit 2
-
-if egrep -qi '^[[:space:]]*Browsing[[:space:]]+(No|Off)[[:space:]]*(#.*)?$' $BROWSECONF; then
+if egrep -qi '^[[:space:]]*Browsing[[:space:]]+(No|Off)[[:space:]]*(#.*)?$' $CONF; then
     exit 0
 fi
-if egrep -qi '^[[:space:]]*Browsing[[:space:]]+(Yes|On)[[:space:]]*(#.*)?$' $BROWSECONF; then
+if egrep -qi '^[[:space:]]*Browsing[[:space:]]+(Yes|On)[[:space:]]*(#.*)?$' $CONF; then
     exit 1
 fi
 exit 2

Modified: cupsys/branches/cups-1.2/debian/local/enable_browsing
==============================================================================
--- cupsys/branches/cups-1.2/debian/local/enable_browsing	(original)
+++ cupsys/branches/cups-1.2/debian/local/enable_browsing	Mon Jul 24 08:55:45 2006
@@ -3,9 +3,8 @@
 # Author: Martin Pitt <martin.pitt at ubuntu.com>
 # (C) 2005  Canonical Ltd.
 #
-# Configure CUPS IPP network browsing; this is only possible if
-# cupsd-browsing.conf is included by cupsd.conf and "Browsing" is present in
-# cupsd-browsing.conf (i. e. browsing_status returns 0 or 1). If the setting
+# Configure CUPS IPP network browsing; this is only possible if "Browsing" is
+# present in cupsd.conf (i. e. browsing_status returns 0 or 1). If the setting
 # changed, CUPS will be restarted.
 #
 # Argument:
@@ -13,7 +12,7 @@
 # 1: enabled browsing
 # Return 0 on success, or 1 on failure (prints error to stderr)
 
-CONF=/etc/cups/cups.d/browse.conf
+CONF=/etc/cups/cupsd.conf
 STATUS_SCRIPT=/usr/share/cups/browsing_status
 
 [ -x $STATUS_SCRIPT ] || {
@@ -53,8 +52,8 @@
 # Automatically added by dh_installinit
 if [ -x "/etc/init.d/cupsys" ]; then
     if [ -x /usr/sbin/invoke-rc.d ]; then
-	invoke-rc.d cupsys restart || exit 0
+	invoke-rc.d cupsys force-reload || exit 0
     else
-	/etc/init.d/cupsys restart || exit 0
+	/etc/init.d/cupsys force-reload || exit 0
     fi
 fi