[Pkg-samba-maint] [samba] 02/06: Fold libnetapi0 into samba-libs.

[Jelmer Vernooij]

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

jelmer pushed a commit to branch samba_4.0_integration
in repository samba.

commit 6b56bc18c9c58ce56a826be4b20487d344801ba8
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Sep 8 17:50:41 2013 +0100

    Fold libnetapi0 into samba-libs.
---
 debian/control               |   42 +++++++++---------------------------------
 debian/libnetapi-dev.install |    3 ---
 debian/libnetapi0.install    |    1 -
 debian/samba-dev.install     |    3 +++
 debian/samba-libs.install    |    1 +
 5 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/debian/control b/debian/control
index 738f3f3..6b527f1 100644
--- a/debian/control
+++ b/debian/control
@@ -128,7 +128,8 @@ Breaks: libdcerpc-server0 (<< 4.0.4),
         libsamdb0 (<< 4.0.4),
         libsmbclient-raw0 (<< 4.0.4),
         libsmbd (<< 4.0.4),
-        libtorture0 (<< 4.0.4)
+        libtorture0 (<< 4.0.4),
+        libnetapi0 (<< 4.0.4)
 Replaces: libdcerpc-server0 (<< 4.0.4),
           libdcerpc0 (<< 4.0.4),
           libgensec0 (<< 4.0.4),
@@ -141,8 +142,9 @@ Replaces: libdcerpc-server0 (<< 4.0.4),
           libsamba-util0 (<< 4.0.4),
           libsamdb0 (<< 4.0.4),
           libsmbclient-raw0 (<< 4.0.4),
-          libsmbd (<< 4.0.4),
-          libtorture0 (<< 4.0.4)
+          libsmbd0 (<< 4.0.4),
+          libtorture0 (<< 4.0.4),
+          libnetapi0 (<< 4.0.4)
 Description: Samba core libraries
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file sharing with Microsoft Windows, OS X,
@@ -303,6 +305,7 @@ Replaces: libdcerpc-dev (<< 4.0.4),
           libsmbclient-raw-dev (<< 4.0.4),
           libsmbd-dev (<< 4.0.4),
           libtorture-dev (<< 4.0.4),
+          libnetapi-dev (<< 4.0.4),
           samba4-dev
 Breaks: libdcerpc-dev (<< 4.0.4),
         libdcerpc-server-dev (<< 4.0.4),
@@ -317,7 +320,8 @@ Breaks: libdcerpc-dev (<< 4.0.4),
         libsamdb (<< 4.0.4),
         libsmbclient-raw-dev (<< 4.0.4),
         libsmbd-dev (<< 4.0.4),
-        libtorture-dev (<< 4.0.4)
+        libtorture-dev (<< 4.0.4),
+        libnetapi-dev (<< 4.0.4)
 Description: tools for extending 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,
@@ -346,8 +350,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
 Section: python
 Provides: ${python:Provides}
-Depends: libnetapi0 (=${binary:Version}),
-         python-ldb,
+Depends: python-ldb,
          python-tdb,
          samba-libs (=${binary:Version}),
          ${misc:Depends},
@@ -422,33 +425,6 @@ Description: development files for libsmbclient
  enables client applications to talk to Microsoft Windows and Samba servers
  using the SMB/CIFS protocol.
 
-Package: libnetapi0
-Section: libs
-Priority: optional
-Architecture: any
-Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: shared library for administrative communication with DCE/RPC servers
- This package provides libnetapi, a library that
- enables client applications to talk administrative and other related
- (but not file sharing) protocols to Microsoft Windows and Samba servers
- using the DCE/RPC protocol.
-
-Package: libnetapi-dev
-Section: libdevel
-Priority: extra
-Architecture: any
-Multi-Arch: same
-Depends: libnetapi0 (= ${binary:Version}), ${misc:Depends}
-Pre-Depends: dpkg (>= 1.15.6~)
-Description: development files for libnetapi
- This package provides the development files (static library and headers)
- required for building applications against libnetapi, a library that
- enables client applications to talk administrative and other related
- (but not file sharing) protocols to Microsoft Windows and Samba servers
- using the DCE/RPC protocol.
-
 Package: libsmbsharemodes0
 Section: libs
 Priority: optional
diff --git a/debian/libnetapi-dev.install b/debian/libnetapi-dev.install
deleted file mode 100644
index b899b76..0000000
--- a/debian/libnetapi-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/samba-4.0/netapi.h
-usr/lib/*/libnetapi.so
-usr/lib/*/pkgconfig/netapi.pc
diff --git a/debian/libnetapi0.install b/debian/libnetapi0.install
deleted file mode 100644
index 5636377..0000000
--- a/debian/libnetapi0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libnetapi.so.0
diff --git a/debian/samba-dev.install b/debian/samba-dev.install
index 6ff85bb..60df6ce 100644
--- a/debian/samba-dev.install
+++ b/debian/samba-dev.install
@@ -142,3 +142,6 @@ usr/lib/*/pkgconfig/samba-util.pc
 usr/lib/*/pkgconfig/samdb.pc
 usr/lib/*/pkgconfig/smbclient-raw.pc
 usr/lib/*/pkgconfig/torture.pc
+usr/include/samba-4.0/netapi.h
+usr/lib/*/libnetapi.so
+usr/lib/*/pkgconfig/netapi.pc
diff --git a/debian/samba-libs.install b/debian/samba-libs.install
index 44de05a..461d627 100644
--- a/debian/samba-libs.install
+++ b/debian/samba-libs.install
@@ -144,3 +144,4 @@ usr/share/man/man8/vfs_streams_xattr.8
 usr/share/man/man8/vfs_time_audit.8
 usr/share/man/man8/vfs_tsmsm.8
 usr/share/man/man8/vfs_xattr_tdb.8
+usr/lib/*/libnetapi.so.0

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