[Pkg-samba-maint] [samba] 01/01: Move dsdb-module library from samba-dsdb-modules to samba-libs, to prevent circular dependencies between samba-dsdb-modules and samba- libs. This is necessary since dsdb-module is now used by the dcerpc- server library.

[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 2ba314be841f8b9336786957688dd79fa82cff02
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Jul 7 01:40:26 2014 +0200

    Move dsdb-module library from samba-dsdb-modules to samba-libs, to prevent circular dependencies between samba-dsdb-modules and samba- libs. This is necessary since dsdb-module is now used by the dcerpc- server library.
    
    Change-Id: Ieb24b0a1c88c994c50846ca73c12960bd3e9dbd5
---
 debian/changelog                  | 6 ++++++
 debian/control                    | 3 ++-
 debian/samba-dsdb-modules.install | 1 -
 debian/samba-libs.install         | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9442467..59b8b7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,12 @@ samba (2:4.1.9+dfsg-2) UNRELEASED; urgency=medium
   * New Brazilian Portugese translation from Adriano Rafael Gomes.
     Closes: #752719
 
+  [ Jelmer Vernooij ]
+  * Move dsdb-module library from samba-dsdb-modules to samba-libs, to
+    prevent circular dependencies between samba-dsdb-modules and samba-
+    libs. This is necessary since dsdb-module is now used by the dcerpc-
+    server library.
+
  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 29 Jun 2014 19:43:52 +0200
 
 samba (2:4.1.9+dfsg-1) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 157b125..79d7ac4 100644
--- a/debian/control
+++ b/debian/control
@@ -162,6 +162,7 @@ Replaces: libdcerpc-server0 (<< 2:4.0.9),
 # see bug #726472
 Conflicts: libpam-smbpass (<< 2:4),
            samba-common-bin (<< 2:4),
+           samba-dsdb-modules (<< 2:4.1.9+dfsg-2),
            samba (<< 2:4),
            winbind (<< 2:4)
 Description: Samba core libraries
@@ -369,7 +370,7 @@ Description: Python bindings for Samba
 
 Package: samba-dsdb-modules
 Architecture: any
-Replaces: libgensec0 (<< 4.0.0~alpha17~git20110724.dfsg1-1)
+Replaces: libgensec0 (<< 4.0.0~alpha17~git20110724.dfsg1-1), samba-libs (<< 2:4.1.9+dfsg-2)
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Enhances: libldb1
diff --git a/debian/samba-dsdb-modules.install b/debian/samba-dsdb-modules.install
index caa3211..8af3ff4 100644
--- a/debian/samba-dsdb-modules.install
+++ b/debian/samba-dsdb-modules.install
@@ -1,3 +1,2 @@
 usr/lib/*/ldb
 usr/lib/*/samba/ldb
-usr/lib/*/samba/libdsdb-module.so.*
diff --git a/debian/samba-libs.install b/debian/samba-libs.install
index 0415a15..d96774b 100644
--- a/debian/samba-libs.install
+++ b/debian/samba-libs.install
@@ -48,6 +48,7 @@ usr/lib/*/samba/libdbwrap.so.*
 usr/lib/*/samba/libdcerpc-samba.so.*
 usr/lib/*/samba/libdcerpc-samba4.so.*
 usr/lib/*/samba/libdfs_server_ad.so.*
+usr/lib/*/samba/libdsdb-module.so.*
 usr/lib/*/samba/liberrors.so.*
 usr/lib/*/samba/libevents.so.*
 usr/lib/*/samba/libflag_mapping.so.*

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