[Pkg-samba-maint] [samba] 06/07: drop do-not-install-smbclient4-and-nmbclient4: applied upstream.

[Jelmer Vernooij]

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

jelmer pushed a commit to branch experimental
in repository samba.

commit f4f38e57e125d1c52c1822ac0f425cb05058821d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Dec 7 15:44:04 2014 +0000

    drop do-not-install-smbclient4-and-nmbclient4: applied upstream.
    
    Change-Id: Ied53d82f53ed679c726e471b14137dcb3184d5bd
---
 .../do-not-install-smbclient4-and-nmbclient4       | 28 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 29 deletions(-)

diff --git a/debian/patches/do-not-install-smbclient4-and-nmbclient4 b/debian/patches/do-not-install-smbclient4-and-nmbclient4
deleted file mode 100644
index 3c74edc..0000000
--- a/debian/patches/do-not-install-smbclient4-and-nmbclient4
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Do not install smbclient4 and nmbclient4
-Author: Jeroen Dekkers <jeroen at dekkers.ch>
-Forwarded: yes
-
---- a/libcli/nbt/wscript_build
-+++ b/libcli/nbt/wscript_build
-@@ -20,7 +20,8 @@
- bld.SAMBA_BINARY('nmblookup' + bld.env.suffix4,
-                  source='tools/nmblookup.c',
-                  manpages='man/nmblookup4.1',
--                 deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE'
-+                 deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE',
-+                 install=False
-                  )
- 
- bld.SAMBA_PYTHON('python_netbios',
---- a/source4/wscript_build
-+++ b/source4/wscript_build
-@@ -2,7 +2,8 @@
- 
- bld.SAMBA_BINARY('client/smbclient'  + bld.env.suffix4,
- 	source='client/client.c',
--	deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw param_options dcerpc'
-+	deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw param_options dcerpc',
-+	install=False
- 	)
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index fafd0c7..7a798cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,5 +11,4 @@ usershare.patch
 VERSION.patch
 waf_smbpasswd_location
 add-so-version-to-private-libraries
-do-not-install-smbclient4-and-nmbclient4
 xsltproc_dont_build_smb.conf.5.patch

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