[Pkg-samba-maint] r2833 - in branches/samba/experimental/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2009-06-06 13:24:27 +0000 (Sat, 06 Jun 2009)
New Revision: 2833

Removed:
   branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/patches/series
Log:
Drop no-unnecessary-cups.patch that has been addressed by
"cups connection timeout" in 3.3.0


Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2009-06-06 13:23:46 UTC (rev 2832)
+++ branches/samba/experimental/debian/changelog	2009-06-06 13:24:27 UTC (rev 2833)
@@ -1,3 +1,11 @@
+samba (2:3.4.0~pre2-2) UNRELEASED; urgency=low
+
+  * debian/patches/no-unnecessary-cups.patch dropped: "cups connection
+    timeout" was introduced in 3.3.0 to address the issue that
+    motivated this workaround
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 06 Jun 2009 14:31:37 +0200
+
 samba (2:3.4.0~pre2-1) experimental; urgency=low
 
   [ Jelmer Vernooij ]

Deleted: branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
===================================================================
--- branches/samba/experimental/debian/patches/no-unnecessary-cups.patch	2009-06-06 13:23:46 UTC (rev 2832)
+++ branches/samba/experimental/debian/patches/no-unnecessary-cups.patch	2009-06-06 13:24:27 UTC (rev 2833)
@@ -1,22 +0,0 @@
-Goal: Don't try to contact the CUPS server when we can reliably
-determine that no printers are needed
-
-Fixes: bug #479512
-
-Upstream status: submitted as bugzilla bug #5525
-
-Index: samba-3.3.0rc2/source3/smbd/server.c
-===================================================================
---- samba-3.3.0rc2.orig/source3/smbd/server.c
-+++ samba-3.3.0rc2/source3/smbd/server.c
-@@ -806,6 +806,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: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2009-06-06 13:23:46 UTC (rev 2832)
+++ branches/samba/experimental/debian/patches/series	2009-06-06 13:24:27 UTC (rev 2833)
@@ -10,6 +10,5 @@
 usershare.patch
 swat-de.patch
 smbtar-bashism.patch
-no-unnecessary-cups.patch
 fix-manpages-warnings.patch
 codepages-location.patch