[Pkg-samba-maint] [samba] 01/01: Cherry-pick 0383e7b04138ad94545a2191019873f26ae3e351 from Debian's packaging repository to fix waf-as-source patch fuzz causing the package to fail to unpack.

[Steve Langasek]

This is an automated email from the git hooks/post-receive script.

vorlon pushed a commit to branch ubuntu
in repository samba.

commit 1737fd178584aa5d5a301fbcea3711a1b6d9fbb6
Author: Iain Lane <iain.lane at canonical.com>
Date:   Sun Aug 25 09:47:10 2013 -0700

    Cherry-pick 0383e7b04138ad94545a2191019873f26ae3e351 from Debian's packaging repository to fix waf-as-source patch fuzz causing the package to fail to unpack.
---
 debian/changelog                   |    8 ++++++++
 debian/patches/waf-as-source.patch |    4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56d5149..ae155e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+samba (2:3.6.15-1ubuntu2) saucy; urgency=low
+
+  * Cherry-pick 0383e7b04138ad94545a2191019873f26ae3e351 from Debian's
+    packaging repository to fix waf-as-source patch fuzz causing the package
+    to fail to unpack. 
+
+ -- Iain Lane <iain.lane at canonical.com>  Thu, 15 Aug 2013 13:30:54 +0100
+
 samba (2:3.6.15-1ubuntu1) saucy; urgency=low
 
   * Merge from Debian git branch; remaining changes:
diff --git a/debian/patches/waf-as-source.patch b/debian/patches/waf-as-source.patch
index 3ba7d23..985ed5a 100644
--- a/debian/patches/waf-as-source.patch
+++ b/debian/patches/waf-as-source.patch
@@ -44,10 +44,6 @@ index 9ef8a1f..0000000
 -You can get a svn copy of the upstream source with:
 -
 -  svn checkout http://waf.googlecode.com/svn/trunk/ waf-read-only
-diff --git a/buildtools/bin/waf-svn b/buildtools/bin/waf-svn
-deleted file mode 100755
-index 6d54d5f..0000000
-Binary files a/buildtools/bin/waf-svn and /dev/null differ
 diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh
 new file mode 100755
 index 0000000..bb3a4bf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git