[Pkg-cups-devel] r715 - in cupsys/trunk: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Sun Mar 16 21:32:42 2008
New Revision: 715

Log:
* Add debian/patches/ubuntu-disable-browsing.dpatch: Disable Browsing by
  default when building on Ubuntu.

Added:
   cupsys/trunk/debian/patches/ubuntu-disable-browsing.dpatch   (contents, props changed)
Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Sun Mar 16 21:32:42 2008
@@ -39,8 +39,10 @@
     branch). Install it in debian/rules if package is built on Ubuntu (tested
     with lsb_release -is). Reload AppArmor in debian/cupsys.postinst if both
     the cupsys profile and AppArmor itself are present.
+  * Add debian/patches/ubuntu-disable-browsing.dpatch: Disable Browsing by
+    default when building on Ubuntu.
 
- -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 21:38:47 +0100
+ -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 22:15:07 +0100
 
 cupsys (1.3.6-1) unstable; urgency=low
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Sun Mar 16 21:32:42 2008
@@ -15,3 +15,4 @@
 pdftops-cups-1.4.dpatch
 pbmprint.dpatch
 testsuite-exit-code.dpatch
+ubuntu-disable-browsing.dpatch

Added: cupsys/trunk/debian/patches/ubuntu-disable-browsing.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/ubuntu-disable-browsing.dpatch	Sun Mar 16 21:32:42 2008
@@ -0,0 +1,27 @@
+#! /bin/sh -e
+## ubuntu-disable-browsing.dpatch by  <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable Browsing by default on Ubuntu (not sanctioned yet by
+## DP: https://wiki.ubuntu.com/DefaultNetworkServices). This is only applied
+## DP: when building on Ubuntu.
+
+[ "`lsb_release -is 2>/dev/null`" = "Ubuntu" ] || { echo -n '(ignored)' >&2; exit 0; }
+. /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+diff -urNad cupsys-1.3.0~rc2~/conf/cupsd.conf.in cupsys-1.3.0~rc2/conf/cupsd.conf.in
+--- cupsys-1.3.0~rc2~/conf/cupsd.conf.in	2007-07-25 01:40:03.000000000 +0100
++++ cupsys-1.3.0~rc2/conf/cupsd.conf.in	2007-08-01 15:27:56.000000000 +0100
+@@ -19,9 +19,10 @@
+ @CUPS_LISTEN_DOMAINSOCKET@
+ 
+ # Show shared printers on the local network.
+-Browsing On
++Browsing Off
+ BrowseOrder allow,deny
+ BrowseAllow all
++BrowseAddress @LOCAL
+ 
+ # Default authentication type, when authentication is required...
+ DefaultAuthType Basic