[Pkg-samba-maint] [samba] 13/20: Move service and process_model modules from the samba-libs to the samba package. Prevents dependencies on libkdc2-heimdal and libhdb9-heimdal.

[Jelmer Vernooij]

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

jelmer pushed a commit to branch samba_4.1
in repository samba.

commit 1a370886be6b61d13bb0ac34fd256424af91e05b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 17 12:34:30 2013 +0000

    Move service and process_model modules from the samba-libs to the samba package. Prevents dependencies on libkdc2-heimdal and libhdb9-heimdal.
---
 debian/changelog          | 3 +++
 debian/control            | 1 +
 debian/samba-libs.install | 2 --
 debian/samba.install      | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d18bc17..f4ac7f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ samba (2:4.1.1+dfsg-1) UNRELEASED; urgency=low
   * Remove handling for SWAT, which is no longer shipped upstream.
   * Split VFS modules out from samba-libs into a separate binary
     package.
+  * Move service and process_model modules from the samba-libs to the
+    samba package. Prevents dependencies on libkdc2-heimdal and
+    libhdb9-heimdal.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 17 Nov 2013 11:47:57 +0000
 
diff --git a/debian/control b/debian/control
index f6b6243..0324777 100644
--- a/debian/control
+++ b/debian/control
@@ -88,6 +88,7 @@ Replaces: libsamdb0 (<< 4.0.0~alpha17~),
           samba-ad-dc,
           samba-common (<= 2.0.5a-2),
           samba-doc (<< 2:4.0.5~),
+          samba-libs (<< 2:4.1.1+dfsg-1),
           samba4
 Conflicts: libldb1 (<< 1:1.1.15),
            samba (<< 2:3.3.0~rc2-5),
diff --git a/debian/samba-libs.install b/debian/samba-libs.install
index 5531e43..865dcff 100644
--- a/debian/samba-libs.install
+++ b/debian/samba-libs.install
@@ -102,8 +102,6 @@ usr/lib/*/samba/libutil_reg.so.*
 usr/lib/*/samba/libutil_setid.so.*
 usr/lib/*/samba/libutil_tdb.so.*
 usr/lib/*/samba/libxattr_tdb.so.*
-usr/lib/*/samba/process_model/*.so
-usr/lib/*/samba/service/*.so
 usr/lib/*/samba/libnon_posix_acls.so.0
 usr/lib/*/samba/libutil_ntdb.so.0
 usr/share/man/man8/idmap_rfc2307.8
diff --git a/debian/samba.install b/debian/samba.install
index 3989d21..fb2a385 100644
--- a/debian/samba.install
+++ b/debian/samba.install
@@ -13,6 +13,8 @@ usr/sbin/samba_dnsupdate
 usr/sbin/samba_spnupdate
 usr/sbin/samba_upgradedns
 usr/sbin/smbd
+usr/lib/*/samba/process_model/*.so
+usr/lib/*/samba/service/*.so
 usr/share/man/man1/log2pcap.1
 usr/share/man/man1/oLschema2ldif.1
 usr/share/man/man1/profiles.1

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