[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. upstream/4.0.6+dfsg-840-g3daed29

[Andrew Bartlett]

The following commit has been merged in the samba_4.0 branch:
commit 3daed29113b40aceb4af046a298ec1907fc61c27
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sun Jun 16 14:08:48 2013 +1000

    unbreak after binutils update by fixing deps on samba4kgetcred
    
    This patch will be upstream and in 4.0 shortly

diff --git a/debian/patches/0001-heimdal-Remove-samba4kgetcred-again.patch b/debian/patches/0001-heimdal-Remove-samba4kgetcred-again.patch
new file mode 100644
index 0000000..dab35a9
--- /dev/null
+++ b/debian/patches/0001-heimdal-Remove-samba4kgetcred-again.patch
@@ -0,0 +1,34 @@
+From 22b005a59ff3db88783cd1f329c97b823ea3f03f Mon Sep 17 00:00:00 2001
+From: Andrew Bartlett <abartlet at samba.org>
+Date: Sun, 16 Jun 2013 13:32:10 +1000
+Subject: [PATCH] heimdal: Remove samba4kgetcred again
+
+This tool is not used in our tests, is not installed, and causes the build
+to fail on current debian unstable due to a new binutils (when linked
+with the system Heimdal).
+
+Andrew Bartlett
+---
+ source4/heimdal_build/wscript_build | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
+index 44634b4..365d319 100644
+--- a/source4/heimdal_build/wscript_build
++++ b/source4/heimdal_build/wscript_build
+@@ -946,12 +946,6 @@ HEIMDAL_BINARY('samba4kinit',
+     install=False
+     )
+ 
+-HEIMDAL_BINARY('samba4kgetcred',
+-    'kuser/kgetcred.c',
+-    deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
+-    install=False
+-    )
+-
+ HEIMDAL_BINARY('samba4kpasswd',
+     'kpasswd/kpasswd.c',
+     deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
+-- 
+1.7.11.7
+
diff --git a/debian/patches/series b/debian/patches/series
index cc86778..b4f8f06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ waf_smbpasswd_location
 documentation2.patch
 0001-build-Install-smbtar-in-waf-build.patch
 0001-build-Add-missing-new-line-to-replaced-python-sheban.patch
+0001-heimdal-Remove-samba4kgetcred-again.patch

-- 
Debian packaging for Samba