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

[Martin Pitt]

Author: mpitt
Date: Tue Apr 25 09:48:07 2006
New Revision: 202

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.postrm
   cupsys/branches/cups-1.2/debian/patches/08_cupsd.conf.conf.d.dpatch
Log:
Merge two bug fixes from Ubuntu branch:

* debian/patches/08_cupsd.conf.conf.d.dpatch:
  - Set "BrowseAddress @LOCAL"; without this, sending browsing information
    does not work (Browsing still has to be enabled).
  - Add some comments to point out that the Port and Browsing settings are
    moved to /etc/cups/cups.d/.
* debian/cupsys.postrm: Clean up passwd.md5 on purge.



Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Tue Apr 25 09:48:07 2006
@@ -16,8 +16,14 @@
     to itself, and *every* user could do admin tasks without authentication.
   * debian/cupsys-client.links: Fix cupsenable/cupsdisable manpage link.
     Closes: #364447
+  * debian/patches/08_cupsd.conf.conf.d.dpatch:
+    - Set "BrowseAddress @LOCAL"; without this, sending browsing information
+      does not work (Browsing still has to be enabled).
+    - Add some comments to point out that the Port and Browsing settings are
+      moved to /etc/cups/cups.d/.
+  * debian/cupsys.postrm: Clean up passwd.md5 on purge.
 
- -- Kenshi Muto <kmuto at debian.org>  Mon, 24 Apr 2006 18:10:19 +0200
+ -- Kenshi Muto <kmuto at debian.org>  Tue, 25 Apr 2006 11:47:18 +0200
 
 cupsys (1.1.99.rc2-0exp1) experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2/debian/cupsys.postrm
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.postrm	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.postrm	Tue Apr 25 09:48:07 2006
@@ -28,6 +28,7 @@
 	rm -rf /var/spool/cups
 	rm -rf /etc/cups/interfaces
 	rm -rf /etc/cups/ppd
+	rm -rf /etc/cups/passwd.md5
 	rm -f /etc/cups/cups.d/*
 	rm -f /etc/cups/printers.conf* /etc/cups/classes.conf.* \
 		/var/lib/cups/ppds.dat /etc/cups/raw.convs /etc/cups/raw.types

Modified: cupsys/branches/cups-1.2/debian/patches/08_cupsd.conf.conf.d.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/08_cupsd.conf.conf.d.dpatch	(original)
+++ cupsys/branches/cups-1.2/debian/patches/08_cupsd.conf.conf.d.dpatch	Tue Apr 25 09:48:07 2006
@@ -5,25 +5,32 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cupsys-1.1.99.b1.r4876~/conf/cupsd.conf.in cupsys-1.1.99.b1.r4876/conf/cupsd.conf.in
---- cupsys-1.1.99.b1.r4876~/conf/cupsd.conf.in	2005-12-15 07:08:54.000000000 +0900
-+++ cupsys-1.1.99.b1.r4876/conf/cupsd.conf.in	2005-12-15 07:10:45.000000000 +0900
-@@ -14,11 +14,11 @@
- SystemGroup @CUPS_GROUP@
+diff -urNad cups-1.2-ubuntu~/conf/cupsd.conf.in cups-1.2-ubuntu/conf/cupsd.conf.in
+--- cups-1.2-ubuntu~/conf/cupsd.conf.in	2006-04-24 19:25:39.000000000 +0200
++++ cups-1.2-ubuntu/conf/cupsd.conf.in	2006-04-25 10:50:24.000000000 +0200
+@@ -14,13 +14,18 @@
+ SystemGroup @CUPS_SYSTEM_GROUPS@
  
  # Only listen for connections from the local machine.
 -Listen localhost:@DEFAULT_IPP_PORT@
 - at CUPS_LISTEN_DOMAINSOCKET@
++# These settings are configured in /etc/cups/cups.d/ports.conf so that
++# changing them does not require to change this file.
 +# Listen localhost:@DEFAULT_IPP_PORT@
 +# @CUPS_LISTEN_DOMAINSOCKET@
  
  # Show shared printers on the local network.
 -Browsing On
-+# Browsing On
++# The 'Browsing' setting is configured in /etc/cups/cups.d/browse.conf
++# so that changing it does not require to change this file.
++# Browsing Off
  BrowseOrder allow,deny
  BrowseAllow @LOCAL
++BrowseAddress @LOCAL
  
-@@ -71,6 +71,10 @@
+ # Default authentication type, when authentication is required...
+ DefaultAuthType Basic
+@@ -71,6 +76,10 @@
    </Limit>
  </Policy>
  
@@ -32,5 +39,5 @@
 +Include /etc/cups/cups.d/browse.conf
 +
  #
- # End of "$Id: cupsd.conf.in 4817 2005-11-04 16:21:01Z mike $".
+ # End of "$Id: cupsd.conf.in 5114 2006-02-16 12:28:29Z mike $".
  #