[Pkg-cups-devel] r336 - in cupsys/branches/cups-1.2-ubuntu/debian: patches

[Martin Pitt]

Author: mpitt
Date: Tue Jul 25 12:26:32 2006
New Revision: 336

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-disable-browsing.dpatch

Log:
* debian/patches/ubuntu-disable-browsing.dpatch: Re-add BrowseAddress
  @LOCAL@ to fix browsing.

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 Jul 25 12:26:32 2006
@@ -1,3 +1,10 @@
+cupsys (1.2.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/ubuntu-disable-browsing.dpatch: Re-add BrowseAddress
+    @LOCAL@ to fix browsing.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 25 Jul 2006 14:22:37 +0200
+
 cupsys (1.2.2-0ubuntu1) edgy; urgency=low
 
   * Merge to Debian unstable:

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-disable-browsing.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-disable-browsing.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-disable-browsing.dpatch	Tue Jul 25 12:26:32 2006
@@ -6,9 +6,9 @@
 
 @DPATCH@
 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-23 23:46:38.000000000 +0200
-+++ cups-1.2-ubuntu/conf/cupsd.conf.in	2006-07-24 11:19:21.000000000 +0200
-@@ -18,7 +18,7 @@
+--- cups-1.2-ubuntu~/conf/cupsd.conf.in	2006-07-25 14:21:51.000000000 +0200
++++ cups-1.2-ubuntu/conf/cupsd.conf.in	2006-07-25 14:22:11.000000000 +0200
+@@ -18,9 +18,10 @@
  @CUPS_LISTEN_DOMAINSOCKET@
  
  # Show shared printers on the local network.
@@ -16,4 +16,7 @@
 +Browsing Off
  BrowseOrder allow,deny
  BrowseAllow @LOCAL
++BrowseAddress @LOCAL
  
+ # Default authentication type, when authentication is required...
+ DefaultAuthType Basic