[Pkg-samba-maint] r4075 - trunk/samba/debian/patches

Wed May 9 13:41:58 UTC 2012

Author: bubulle
Date: 2012-05-09 13:41:57 +0000 (Wed, 09 May 2012)
New Revision: 4075

Modified:
   trunk/samba/debian/patches/bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch
   trunk/samba/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
   trunk/samba/debian/patches/bug_601406_fix-perl-path-in-example.patch
   trunk/samba/debian/patches/bug_604768_upstream_7826_drop-using-samba-link.patch
   trunk/samba/debian/patches/bug_604768_upstream_7826_fix-WHATSNEW-link.patch
   trunk/samba/debian/patches/documentation2.patch
   trunk/samba/debian/patches/dont-build-VFS-examples.patch
   trunk/samba/debian/patches/fix-samba.ldip-syntax.patch
   trunk/samba/debian/patches/smbtar-bashism.patch
   trunk/samba/debian/patches/waf-as-source.patch
Log:
Properly use "Forwarded:" and "Bug:" to record whether patches have
been forwarded upstream or not


Modified: trunk/samba/debian/patches/bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch
===================================================================

--- trunk/samba/debian/patches/bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch	2012-05-09 13:26:13 UTC (rev 4074)
+++ trunk/samba/debian/patches/bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch	2012-05-09 13:41:57 UTC (rev 4075)
@@ -2,6 +2,7 @@
 Author: Christian Perrier <bubulle at debian.org>
 Bug-Debian: http://bugs.debian.org/387266
 Forwarded: yes
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=4104
 
 Index: samba/docs-xml/manpages-3/smbspool.8.xml
 ===================================================================

Modified: trunk/samba/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
===================================================================
--- trunk/samba/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch	2012-05-09 13:26:13 UTC (rev 4074)
+++ trunk/samba/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch	2012-05-09 13:41:57 UTC (rev 4075)
@@ -2,6 +2,7 @@
 Author: Christian Perrier <bubulle at debian.org>,Buchan Milne 
 Bug-Debian: http://bugs.debian.org/598313
 Forwarded: yes
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=7499
 
 Index: samba/lib/util/debug.c
 ===================================================================

Modified: trunk/samba/debian/patches/bug_601406_fix-perl-path-in-example.patch
===================================================================
--- trunk/samba/debian/patches/bug_601406_fix-perl-path-in-example.patch	2012-05-09 13:26:13 UTC (rev 4074)
+++ trunk/samba/debian/patches/bug_601406_fix-perl-path-in-example.patch	2012-05-09 13:41:57 UTC (rev 4075)
@@ -1,7 +1,7 @@
 Description: Fix path to perl binary in example file
 Author: Christian Perrier <bubulle at debian.org>
 Bug-Debian: http://bugs.debian.org/601406
-Forwarded: no
+Forwarded: not-needed
 
 Index: samba/examples/misc/wall.perl
 ===================================================================

Modified: trunk/samba/debian/patches/bug_604768_upstream_7826_drop-using-samba-link.patch
===================================================================
--- trunk/samba/debian/patches/bug_604768_upstream_7826_drop-using-samba-link.patch	2012-05-09 13:26:13 UTC (rev 4074)
+++ trunk/samba/debian/patches/bug_604768_upstream_7826_drop-using-samba-link.patch	2012-05-09 13:41:57 UTC (rev 4075)
@@ -2,6 +2,7 @@
 Author: Christian Perrier <bubulle at debian.org>
 Bug-Debian: http://bugs.debian.org/604768
 Forwarded: yes
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=7826
 
 Index: samba/docs/htmldocs/index.html
 ===================================================================

Modified: trunk/samba/debian/patches/bug_604768_upstream_7826_fix-WHATSNEW-link.patch
===================================================================
--- trunk/samba/debian/patches/bug_604768_upstream_7826_fix-WHATSNEW-link.patch	2012-05-09 13:26:13 UTC (rev 4074)
+++ trunk/samba/debian/patches/bug_604768_upstream_7826_fix-WHATSNEW-link.patch	2012-05-09 13:41:57 UTC (rev 4075)
@@ -1,7 +1,7 @@
 Description: Fix WHATSNEW.txt link in HTML documentation summary to fit Debian files organization
 Author: Christian Perrier <bubulle at debian.org>
 Bug-Debian: http://bugs.debian.org/604768
-Forwarded: Debian specific
+Forwarded: not-needed
 
 Index: samba/docs/htmldocs/index.html
 ===================================================================

Modified: trunk/samba/debian/patches/documentation2.patch
===================================================================
--- trunk/samba/debian/patches/documentation2.patch	2012-05-09 13:26:13 UTC (rev 4074)
+++ trunk/samba/debian/patches/documentation2.patch	2012-05-09 13:41:57 UTC (rev 4075)
@@ -1,6 +1,7 @@
 Description: Remove documentation parts that do not apply to Debian
 Author: Christian Perrier <bubulle at debian.org>
-Forwarded: https://bugzilla.samba.org/show_bug.cgi?id=8789
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=8789
+Forwarded: yes
 
 Index: samba-debian/docs-xml/manpages-3/nmbd.8.xml
 ===================================================================

Modified: trunk/samba/debian/patches/dont-build-VFS-examples.patch
===================================================================
--- trunk/samba/debian/patches/dont-build-VFS-examples.patch	2012-05-09 13:26:13 UTC (rev 4074)
+++ trunk/samba/debian/patches/dont-build-VFS-examples.patch	2012-05-09 13:41:57 UTC (rev 4075)
@@ -1,3 +1,7 @@
+Description: Do not build VFS examples
+Author: Christian Perrier <bubulle at debian.org>
+Forwarded: not-needed
+
 Index: experimental/source3/Makefile.in
 ===================================================================
 --- experimental.orig/source3/Makefile.in

Modified: trunk/samba/debian/patches/fix-samba.ldip-syntax.patch
===================================================================
--- trunk/samba/debian/patches/fix-samba.ldip-syntax.patch	2012-05-09 13:26:13 UTC (rev 4074)
+++ trunk/samba/debian/patches/fix-samba.ldip-syntax.patch	2012-05-09 13:41:57 UTC (rev 4075)
@@ -1,6 +1,7 @@
 Description: Fix example samba.ldif
 Author: Christian Perrier <bubulle at debian.org>
-Forwarded: https://bugzilla.samba.org/show_bug.cgi?id=8789
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=8789
+Forwarded: yes
 Bug-Debian: http://bugs.debian.org/659963
 
 Index: samba/examples/LDAP/samba.ldif

Modified: trunk/samba/debian/patches/smbtar-bashism.patch
===================================================================
--- trunk/samba/debian/patches/smbtar-bashism.patch	2012-05-09 13:26:13 UTC (rev 4074)
+++ trunk/samba/debian/patches/smbtar-bashism.patch	2012-05-09 13:41:57 UTC (rev 4075)
@@ -1,7 +1,8 @@
 Description: Avoid using bashism in smbtar
 Author: Jelmer Vernooij <jelmer at samba.org>
 Bug-Debian: http://bugs.debian.org/486056
-Forwarded: no
+Forwarded: yes
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=8924
 
 Index: experimental/source3/script/smbtar
 ===================================================================

Modified: trunk/samba/debian/patches/waf-as-source.patch
===================================================================
--- trunk/samba/debian/patches/waf-as-source.patch	2012-05-09 13:26:13 UTC (rev 4074)
+++ trunk/samba/debian/patches/waf-as-source.patch	2012-05-09 13:41:57 UTC (rev 4075)
@@ -1,9 +1,9 @@
-commit 4f4bce5301ffd8c12aed1b108affa1a75feefb67
+Description: Include waf as an extracted source directory, rather than as a one-in-a-file script.
 Author: Jelmer Vernooij <jelmer at samba.org>
-Date:   Wed Jan 4 00:31:27 2012 +0100
+Bug-Debian: http://bugs.debian.org/654499
+Forwarded: yes
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=8923
 
-    Include waf as an extracted source directory, rather than as a one-in-a-file script.
-
 diff --git a/buildtools/README b/buildtools/README
 new file mode 100644
 index 0000000..eab0382



