[Pkg-cups-devel] r207 - cupsys/branches/cups-1.2-ubuntu/debian

[Martin Pitt]

Author: mpitt
Date: Tue Apr 25 13:59:58 2006
New Revision: 207

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.config
Log:
* debian/cupsys.config:
  - Fix handling of cupsd-browsing.conf -> cups.d/browse.conf transition for
    breezy->dapper upgrades.
  - Fix browse.conf parsing to set the correct debconf default value, so
    that the browse setting is not reset to 'off' on upgrades.
    Closes: LP#38704



Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Tue Apr 25 13:59:58 2006
@@ -16,8 +16,14 @@
   * debian/cupsys.postinst: If upgrading from Breezy, adapt the inclusion of
     external browsing configuration in cupsd.conf to retain the correct
     setting for modified cupsd.conf files.
+  * debian/cupsys.config: 
+    - Fix handling of cupsd-browsing.conf -> cups.d/browse.conf transition for
+      breezy->dapper upgrades. 
+    - Fix browse.conf parsing to set the correct debconf default value, so
+      that the browse setting is not reset to 'off' on upgrades. 
+      Closes: LP#38704
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 25 Apr 2006 15:20:06 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 25 Apr 2006 15:58:01 +0200
 
 cupsys (1.1.99.rc2-0ubuntu2) dapper; urgency=low
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.config
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.config	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.config	Tue Apr 25 13:59:58 2006
@@ -6,6 +6,13 @@
 PORTS=/etc/cups/cups.d/ports.conf
 BROWSE=/etc/cups/cups.d/browse.conf
 
+# Move cupsd-browsing.conf to new location and name
+if [ -f /etc/cups/cupsd-browsing.conf -a ! -e /etc/cups/cups.d/browse.conf ]; then
+    echo "Moving /etc/cups/cupsd-browsing.conf to new location /etc/cups/cups.d/browse.conf..."
+    mkdir -p /etc/cups/cups.d
+    mv /etc/cups/cupsd-browsing.conf /etc/cups/cups.d/browse.conf
+fi
+
 # Debconf library
 . /usr/share/debconf/confmodule
 
@@ -101,13 +108,15 @@
     db_get cupsys/ports
   done
 
-  if [ "$(grep -h "Include[[:space:]]\+$BROWSE" $CONF)" -a -f "$BROWSE" ]; then
+  if [ "$(grep -h "Include[[:space:]]\+\($BROWSE\|cupsd-browsing.conf\)" $CONF)" -a -f "$BROWSE" ]; then
     RET=$(grep -h -e "^Browsing[[:space:]]\+" $CONF $BROWSE | head -1 | sed -e "s/Browsing[[:space:]]\+//" | tr "A-Z" "a-z")
   else
     RET=$(grep -h -e "^Browsing[[:space:]]\+" $CONF | head -1 | sed -e "s/Browsing[[:space:]]\+//" | tr "A-Z" "a-z")
   fi
   if [ "$RET" = "off" ]; then
     db_set cupsys/browse false
+  elif [ "$RET" = "on" ]; then
+    db_set cupsys/browse true
   fi
   db_input low cupsys/browse || true
   db_go