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

[Kenshi Muto]

Author: kmuto
Date: Wed Dec 14 22:17:41 2005
New Revision: 60

Added:
   cupsys/branches/cups-1.2/debian/patches/obsolete/10_cupsd.conf2.dpatch
      - copied unchanged from r48, cupsys/branches/cups-1.2/debian/patches/10_cupsd.conf2.dpatch
Removed:
   cupsys/branches/cups-1.2/debian/patches/10_cupsd.conf2.dpatch
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list
   cupsys/branches/cups-1.2/debian/patches/08_cupsd.conf.conf.d.dpatch
Log:
comment out port/listen/browsing because CUPS couldn't handle duplicate configuration

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 14 22:17:41 2005
@@ -1,4 +1,16 @@
-cupsys (1.1.99.b1.r4841-2) UNRELEASED; urgency=low
+cupsys (1.1.99.b1.r4876-2) UNRELEASED; urgency=low
+
+  [ Kenshi Muto ]
+  * Updated Russian debconf translation, taken from cupsys trunk.
+  * Downgrade port and browse question to low.
+  * Add timeout routine to avoid lockup.
+  * debian/patches/08_cupsd.conf.conf.d.dpatch:
+    - Commented out Port/Listen/Browsing from cupsd.conf.in.
+      CUPS crashes when there is a duplicate definition.
+
+ -- Kenshi Muto <kmuto at debian.org>  Thu, 15 Dec 2005 07:15:54 +0900
+
+cupsys (1.1.99.b1.r4876-1) unstable; urgency=low
 
   [ Martin Pitt ]
   * debian/local/{enable_browsing,browsing_status}: Adapt configuration file
@@ -34,11 +46,9 @@
       printers, etc.)
 
   [ Kenshi Muto ]
-  * Updated Russian debconf translation, taken from cupsys trunk.
-  * Downgrade port and browse question to low.
-  * Add timeout routine to avoid lockup.
+  * New SVN release taken from r4876.
 
- -- Kenshi Muto <kmuto at debian.org>  Thu, 15 Dec 2005 05:48:20 +0900
+ -- Kenshi Muto <kmuto at debian.org>  Thu,  8 Dec 2005 21:26:22 +0900
 
 cupsys (1.1.99.b1.r4841-1) experimental; urgency=low
 

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 14 22:17:41 2005
@@ -6,7 +6,6 @@
 07_removecvstag.dpatch
 08_cupsd.conf.conf.d.dpatch
 09_runasuser_fixes.dpatch
-10_cupsd.conf2.dpatch
 11_pam.dpatch
 19_cupsaccept.dpatch
 26_modprobe.dpatch

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	Wed Dec 14 22:17:41 2005
@@ -5,9 +5,24 @@
 ## DP: No description.
 
 @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
+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@
+ 
+ # Only listen for connections from the local machine.
+-Listen localhost:@DEFAULT_IPP_PORT@
+- at CUPS_LISTEN_DOMAINSOCKET@
++# Listen localhost:@DEFAULT_IPP_PORT@
++# @CUPS_LISTEN_DOMAINSOCKET@
+ 
+ # Show shared printers on the local network.
+-Browsing On
++# Browsing On
+ BrowseOrder allow,deny
+ BrowseAllow @LOCAL
+ 
 @@ -71,6 +71,10 @@
    </Limit>
  </Policy>