[Pkg-samba-maint] [samba] 01/02: Move libtorture0 to samba-testsuite to reduce size of samba-libs and prevent dependency on libsubunit0.

[Jelmer Vernooij]

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

jelmer pushed a commit to branch master
in repository samba.

commit da6b96d99bfe7d36903c8bef90fdd693dafb0413
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 27 18:05:47 2013 +0100

    Move libtorture0 to samba-testsuite to reduce size of samba-libs and prevent dependency on libsubunit0.
---
 debian/changelog               |    4 ++++
 debian/control                 |    4 ++--
 debian/samba-libs.install      |    1 -
 debian/samba-testsuite.install |    1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c877168..67e5d6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ samba (2:4.0.10+dfsg-4) UNRELEASED; urgency=low
   * Polish (Michał Kułach).  Closes: #727646
   * Danish (Joe Hansen).  Closes: #727764
 
+  [ Jelmer Vernooij ]
+  * Move libtorture0 to samba-testsuite to reduce size of samba-libs and
+    prevent dependency on libsubunit0.
+
  -- Christian Perrier <bubulle at debian.org>  Tue, 22 Oct 2013 20:29:59 +0200
 
 samba (2:4.0.10+dfsg-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 286a293..1da2ea7 100644
--- a/debian/control
+++ b/debian/control
@@ -221,8 +221,8 @@ Description: command-line SMB/CIFS clients for Unix
 Package: samba-testsuite
 Architecture: any
 Recommends: subunit
-Replaces: samba-doc (<< 2:4.0.5~), samba-tools, samba4-testsuite
-Conflicts: samba-doc (<< 2:4.0.5~)
+Replaces: samba-doc (<< 2:4.0.5~), samba-tools, samba4-testsuite, samba-libs (<< 2:4.0.10+dfsg-4)
+Conflicts: samba-doc (<< 2:4.0.5~), samba-libs (<< 2:4.0.10+dfsg-4)
 Depends: samba-common-bin, ${misc:Depends}, ${shlibs:Depends}
 Description: test suite from Samba
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
diff --git a/debian/samba-libs.install b/debian/samba-libs.install
index 12b0f4c..e2df986 100644
--- a/debian/samba-libs.install
+++ b/debian/samba-libs.install
@@ -20,7 +20,6 @@ usr/lib/*/libsmbclient-raw.so.0*
 usr/lib/*/libsmbconf.so.0
 usr/lib/*/libsmbldap.so.0
 usr/lib/*/libtevent-util.so.*
-usr/lib/*/libtorture.so.*
 usr/lib/*/samba/auth/
 usr/lib/*/samba/bind9/dlz_bind9.so
 usr/lib/*/samba/bind9/dlz_bind9_9.so
diff --git a/debian/samba-testsuite.install b/debian/samba-testsuite.install
index 331cb40..b4a9c46 100644
--- a/debian/samba-testsuite.install
+++ b/debian/samba-testsuite.install
@@ -3,6 +3,7 @@ usr/bin/locktest
 usr/bin/masktest
 usr/bin/ndrdump
 usr/bin/smbtorture
+usr/lib/*/libtorture.so.*
 usr/lib/*/samba/libdlz_bind9_for_torture.so.*
 usr/share/man/man1/gentest.1
 usr/share/man/man1/locktest.1

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