[Pkg-samba-maint] [samba] 05/05: Add patch to not install smbclient4 and nmblookup4 and remove samba4-clients binary package.

[Jeroen Dekkers]

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

dekkers-guest pushed a commit to branch samba_4.0_integration
in repository samba.

commit dd301b114dd2e4160624187031ce6828fdbd3051
Author: Jeroen Dekkers <jeroen at dekkers.ch>
Date:   Sat Sep 21 00:59:06 2013 +0200

    Add patch to not install smbclient4 and nmblookup4 and remove
    samba4-clients binary package.
---
 debian/changelog                                   |    2 ++
 debian/control                                     |   18 -------------
 .../do-not-install-smbclient4-and-nmbclient4       |   28 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 debian/samba4-clients.install                      |    3 ---
 debian/samba4-clients.lintian-overrides            |    1 -
 6 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd45e7d..949d612 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ samba (2:4.0.9+dfsg-1) UNRELEASED; urgency=low
 
   [ Jeroen Dekkers ]
   * Drop 10_messaging_subsystem patch.
+  * Add patch to not install smbclient4 and nmblookup4 and remove
+    samba4-clients binary package.
 
  -- Steve Langasek <vorlon at debian.org>  Fri, 16 Aug 2013 02:00:12 +0200
 
diff --git a/debian/control b/debian/control
index 0238784..02fc5a4 100644
--- a/debian/control
+++ b/debian/control
@@ -218,24 +218,6 @@ Description: command-line SMB/CIFS clients for Unix
  Utilities for mounting shares locally are found in the package
  cifs-utils.
 
-Package: samba4-clients
-Architecture: any
-Depends: samba-common-bin (=${binary:Version}),
-         smbclient,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Replaces: samba-doc (<< 2:4.0.5~)
-Conflicts: samba-common (<< 2:3.3.0~rc2-5), samba-doc (<< 2:4.0.5~)
-Description: client utilities from Samba
- Samba is an implementation of the SMB/CIFS protocol for Unix systems,
- providing support for cross-platform file sharing with Microsoft Windows, OS X,
- and other Unix systems.  Samba can also function as a domain controller
- or member server in both NT4-style and Active Directory domains.
- .
- This package contains some client components of the Samba suite. In
- particular it includes the command line utilities smbclient, net,
- and some ACL tools.
-
 Package: samba-testsuite
 Architecture: any
 Recommends: subunit
diff --git a/debian/patches/do-not-install-smbclient4-and-nmbclient4 b/debian/patches/do-not-install-smbclient4-and-nmbclient4
new file mode 100644
index 0000000..3c74edc
--- /dev/null
+++ b/debian/patches/do-not-install-smbclient4-and-nmbclient4
@@ -0,0 +1,28 @@
+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 9812f58..4a63691 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ usershare.patch
 VERSION.patch
 waf_smbpasswd_location
 add-so-version-to-private-libraries
+do-not-install-smbclient4-and-nmbclient4
diff --git a/debian/samba4-clients.install b/debian/samba4-clients.install
deleted file mode 100644
index d2a94b5..0000000
--- a/debian/samba4-clients.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/nmblookup4
-usr/bin/smbclient4
-usr/share/man/man1/nmblookup4.1
diff --git a/debian/samba4-clients.lintian-overrides b/debian/samba4-clients.lintian-overrides
deleted file mode 100644
index df4bfad..0000000
--- a/debian/samba4-clients.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-samba4-clients binary: binary-or-shlib-defines-rpath

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