[Pkg-samba-maint] r3830 - in trunk/samba/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2011-06-17 20:32:02 +0000 (Fri, 17 Jun 2011)
New Revision: 3830

Removed:
   trunk/samba/debian/patches/no-unnecessary-cups.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
patches/no-unnecessary-cups.patch: dropped after upstream
changes to printing code

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-06-17 20:31:03 UTC (rev 3829)
+++ trunk/samba/debian/changelog	2011-06-17 20:32:02 UTC (rev 3830)
@@ -8,8 +8,10 @@
     This very partially addresses #190162
   * patches/bug_221618_precise-64bit-prototype.patch: precise
     64bits prototype in libsmbclient-dev. Closes: #221618
+  * patches/no-unnecessary-cups.patch: dropped after upstream
+    changes to printing code
 
- -- Christian Perrier <bubulle at debian.org>  Sun, 12 Jun 2011 22:01:19 +0200
+-- Christian Perrier <bubulle at debian.org>  Sun, 12 Jun 2011 22:01:19 +0200
 
 samba (2:3.5.8~dfsg-5) unstable; urgency=low
 

Deleted: trunk/samba/debian/patches/no-unnecessary-cups.patch
===================================================================
--- trunk/samba/debian/patches/no-unnecessary-cups.patch	2011-06-17 20:31:03 UTC (rev 3829)
+++ trunk/samba/debian/patches/no-unnecessary-cups.patch	2011-06-17 20:32:02 UTC (rev 3830)
@@ -1,23 +0,0 @@
-Description: Drop unneeded calls to CUPS server
- Don't try to contact the CUPS server when we can reliably
- determine that no printers are needed
-Author: Steve Langasek <vorlon at debian.org>
-Bug-Debian: http://bugs.debian.org/479512
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=5525
-Forwarded: yes
-
-Index: experimental/source3/smbd/server.c
-===================================================================
---- experimental.orig/source3/smbd/server.c
-+++ experimental/source3/smbd/server.c
-@@ -710,6 +710,10 @@
- 	int pnum = lp_servicenumber(PRINTERS_NAME);
- 	const char *pname;
- 
-+	if (!lp_load_printers()
-+	    && (lp_auto_services() == NULL || !strcmp(lp_auto_services(),"")))
-+		return;
-+
- 	pcap_cache_reload();
- 
- 	/* remove stale printers */

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2011-06-17 20:31:03 UTC (rev 3829)
+++ trunk/samba/debian/patches/series	2011-06-17 20:32:02 UTC (rev 3830)
@@ -9,7 +9,6 @@
 adapt_machine_creation_script.patch
 usershare.patch
 smbtar-bashism.patch
-no-unnecessary-cups.patch
 autoconf.patch
 bug_574468_upstream_7265.patch
 bug_610678_fix-ftbfs-hurd.patch