[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. upstream/4.0.5+dfsg1-806-gfdbe5f7

[Christian Perrier]

The following commit has been merged in the samba_4.0 branch:
commit 44e8cbcc7cc257995ff1eaad70370d1ea878f1c3
Author: Christian Perrier <bubulle at debian.org>
Date:   Fri May 17 17:43:52 2013 +0200

    Drop samba-tools
     The tools are no longer here and the only use would
     be for puttin vfstest.1 manpage but that manpage is useless
     as vfstest is no longer provided.

diff --git a/debian/changelog b/debian/changelog
index e03aedd..0fdc3e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,6 @@ samba (2:4.0.5+dfsg1-2) UNRELEASED; urgency=low
     eventually specific to version 4 and above)
   * Add libctdb-dev to build dependencies as we're building with cluster
     support just like 3.6 packages
-  * Add samba-tools to binary packages (similar to the one in 3.x series)
 
  -- Andrew Bartlett <abartlet at samba.org>  Thu, 09 May 2013 15:41:19 +1200
 
diff --git a/debian/control b/debian/control
index cb4304f..c09a912 100644
--- a/debian/control
+++ b/debian/control
@@ -981,17 +981,3 @@ Description: Samba winbind client library - development files
  applications that interact via the winbind pipe protocol with a Samba
  winbind server.
 
-Package: samba-tools
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: dpkg (>= 1.15.6~)
-Conflicts: samba4, samba4-testsuite
-Description: Samba testing utilities
- Samba is an implementation of the SMB/CIFS protocol for Unix systems,
- providing support for cross-platform file and printer sharing with
- Microsoft Windows, OS X, and other Unix systems.
- .
- This package contains extra command-line tools such as smbtorture for
- performance-testing CIFS servers and clients.
-
-
diff --git a/debian/rules b/debian/rules
index b356bdd..5640266 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,6 +108,8 @@ override_dh_install:
 	rm $(DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libnss_*.so
 	#Remove unused ldb share configuration plugin
 	rm $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba/share/ldb.so
+	#Remove unused vfstest manpage as there is no more vfstest apparently
+	rm $(DESTDIR)/usr/share/man/man1/vfstest.1
 	mkdir -p $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/plugin/krb5
 	mv $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/winbind_krb5_locator.so \
 	   $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/plugin/krb5
diff --git a/debian/samba-tools.install b/debian/samba-tools.install
deleted file mode 100644
index a7f2774..0000000
--- a/debian/samba-tools.install
+++ /dev/null
@@ -1,11 +0,0 @@
-source3/bin/smbtorture usr/bin
-source3/bin/msgtest usr/bin
-source3/bin/masktest usr/bin
-source3/bin/locktest usr/bin
-source3/bin/locktest2 usr/bin
-source3/bin/nsstest usr/bin
-source3/bin/vfstest usr/bin
-source3/bin/pdbtest usr/bin
-source3/bin/replacetort usr/bin
-source3/bin/smbconftort usr/bin
-usr/share/man/man1/vfstest.1

-- 
Debian packaging for Samba