[Pkg-cups-devel] r43 - in cupsys/branches/cups-1.2/debian: . patches

[Martin Pitt]

Author: mpitt
Date: Wed Dec  7 13:10:27 2005
New Revision: 43

Added:
   cupsys/branches/cups-1.2/debian/patches/08_cupsd.conf.conf.d.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.postinst
   cupsys/branches/cups-1.2/debian/patches/00list
Log:
Clean up support for /etc/cups/conf.d:
- Add debian/patches/08_cupsd.conf.conf.d.dpatch: Add include commands to
  default cupsd.conf file.
- debian/cupsys.postinst: Remove fiddling with cupsd.conf.
- This will ensure that cupsd.conf will remain an unchanged conffile.



Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Dec  7 13:10:27 2005
@@ -10,8 +10,13 @@
   * debian/cupsys.postinst: Wait a second between kill -9'ing cupsys and
     checking if the process still exists to avoid false positives and upgrade
     failures.
+  * Clean up support for /etc/cups/conf.d:
+    - Add debian/patches/08_cupsd.conf.conf.d.dpatch: Add include commands to
+      default cupsd.conf file.
+    - debian/cupsys.postinst: Remove fiddling with cupsd.conf.
+    - This will ensure that cupsd.conf will remain an unchanged conffile.
 
- -- Martin Pitt <mpitt at debian.org>  Wed,  7 Dec 2005 13:52:42 +0100
+ -- Martin Pitt <mpitt at debian.org>  Wed,  7 Dec 2005 14:08:37 +0100
 
 cupsys (1.1.99.b1.r4841-1) experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.postinst	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.postinst	Wed Dec  7 13:10:27 2005
@@ -192,15 +192,6 @@
 	else
 	  echo "Browsing off" > /etc/cups/cups.d/browse.conf
 	fi
-
-	grep -v "^\(Browsing\|Port\|Listen\)[[:space:]]" /etc/cups/cupsd.conf > /etc/cups/cupsd.conf.$$
-	if [ -z "$(grep -e "^Include[[:space:]]\+/etc/cups/cups.d/ports.conf" /etc/cups/cupsd.conf.$$)" ]; then
-	  echo "Include /etc/cups/cups.d/ports.conf" >> /etc/cups/cupsd.conf.$$
-	fi
-	if [ -z "$(grep -e "^Include[[:space:]]\+/etc/cups/cups.d/browse.conf" /etc/cups/cupsd.conf.$$)" ]; then
-	  echo "Include /etc/cups/cups.d/browse.conf" >> /etc/cups/cupsd.conf.$$
-	fi
-	mv /etc/cups/cupsd.conf.$$ /etc/cups/cupsd.conf
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Wed Dec  7 13:10:27 2005
@@ -4,6 +4,7 @@
 05_avoidunknowngroup.dpatch
 06_replacepdftops.dpatch
 07_removecvstag.dpatch
+08_cupsd.conf.conf.d.dpatch
 10_cupsd.conf2.dpatch
 11_pam.dpatch
 19_cupsaccept.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/08_cupsd.conf.conf.d.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/08_cupsd.conf.conf.d.dpatch	Wed Dec  7 13:10:27 2005
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_cupsd.conf.conf.d.dpatch by  <mpitt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys~/conf/cupsd.conf.in cupsys/conf/cupsd.conf.in
+--- cupsys~/conf/cupsd.conf.in	2005-11-04 17:21:01.000000000 +0100
++++ cupsys/conf/cupsd.conf.in	2005-12-07 14:05:18.000000000 +0100
+@@ -71,6 +71,10 @@
+   </Limit>
+ </Policy>
+ 
++# Include files in /etc/cups/conf.d
++Include /etc/cups/cups.d/ports.conf
++Include /etc/cups/cups.d/browse.conf
++
+ #
+ # End of "$Id: cupsd.conf.in 4817 2005-11-04 16:21:01Z mike $".
+ #