[Pkg-samba-maint] [samba] 03/06: wrap-and-sort.

[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 6010592d0e1cec9c7df74a152c4bb89b0e961c67
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Sep 14 13:39:10 2013 +0100

    wrap-and-sort.
---
 debian/control            |   14 +++++++-------
 debian/samba-dev.install  |    6 +++---
 debian/samba-libs.install |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 6b527f1..a8d523c 100644
--- a/debian/control
+++ b/debian/control
@@ -120,6 +120,7 @@ Breaks: libdcerpc-server0 (<< 4.0.4),
         libgensec0 (<< 4.0.4),
         libndr-standard0 (<< 4.0.4),
         libndr0 (<< 4.0.4),
+        libnetapi0 (<< 4.0.4),
         libregistry0 (<< 4.0.4),
         libsamba-credentials0 (<< 4.0.4),
         libsamba-hostconfig (<< 4.0.4),
@@ -128,13 +129,13 @@ Breaks: libdcerpc-server0 (<< 4.0.4),
         libsamdb0 (<< 4.0.4),
         libsmbclient-raw0 (<< 4.0.4),
         libsmbd (<< 4.0.4),
-        libtorture0 (<< 4.0.4),
-        libnetapi0 (<< 4.0.4)
+        libtorture0 (<< 4.0.4)
 Replaces: libdcerpc-server0 (<< 4.0.4),
           libdcerpc0 (<< 4.0.4),
           libgensec0 (<< 4.0.4),
           libndr-standard0 (<< 4.0.4),
           libndr0 (<< 4.0.4),
+          libnetapi0 (<< 4.0.4),
           libregistry0 (<< 4.0.4),
           libsamba-credentials0 (<< 4.0.4),
           libsamba-hostconfig (<< 4.0.4),
@@ -143,8 +144,7 @@ Replaces: libdcerpc-server0 (<< 4.0.4),
           libsamdb0 (<< 4.0.4),
           libsmbclient-raw0 (<< 4.0.4),
           libsmbd0 (<< 4.0.4),
-          libtorture0 (<< 4.0.4),
-          libnetapi0 (<< 4.0.4)
+          libtorture0 (<< 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,
@@ -296,6 +296,7 @@ Replaces: libdcerpc-dev (<< 4.0.4),
           libgensec-dev (<< 4.0.4),
           libndr-dev (<< 4.0.4),
           libndr-standard-dev (<< 4.0.4),
+          libnetapi-dev (<< 4.0.4),
           libregistry-dev (<< 4.0.4),
           libsamba-credentials-dev (<< 4.0.4),
           libsamba-hostconfig-dev (<< 4.0.4),
@@ -305,13 +306,13 @@ 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),
         libgensec-dev (<< 4.0.4),
         libndr-dev (<< 4.0.4),
         libndr-standard-dev (<< 4.0.4),
+        libnetapi-dev (<< 4.0.4),
         libregistry-dev (<< 4.0.4),
         libsamba-credentials-dev (<< 4.0.4),
         libsamba-hostconfig-dev (<< 4.0.4),
@@ -320,8 +321,7 @@ 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),
-        libnetapi-dev (<< 4.0.4)
+        libtorture-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,
diff --git a/debian/samba-dev.install b/debian/samba-dev.install
index 60df6ce..b42c771 100644
--- a/debian/samba-dev.install
+++ b/debian/samba-dev.install
@@ -53,6 +53,7 @@ usr/include/samba-4.0/ndr/ndr_drsblobs.h
 usr/include/samba-4.0/ndr/ndr_drsuapi.h
 usr/include/samba-4.0/ndr/ndr_nbt.h
 usr/include/samba-4.0/ndr/ndr_svcctl.h
+usr/include/samba-4.0/netapi.h
 usr/include/samba-4.0/param.h
 usr/include/samba-4.0/passdb.h
 usr/include/samba-4.0/policy.h
@@ -113,6 +114,7 @@ usr/lib/*/libndr-krb5pac.so
 usr/lib/*/libndr-nbt.so
 usr/lib/*/libndr-standard.so
 usr/lib/*/libndr.so
+usr/lib/*/libnetapi.so
 usr/lib/*/libpdb.so
 usr/lib/*/libregistry.so
 usr/lib/*/libsamba-credentials.so
@@ -134,6 +136,7 @@ usr/lib/*/pkgconfig/ndr.pc
 usr/lib/*/pkgconfig/ndr_krb5pac.pc
 usr/lib/*/pkgconfig/ndr_nbt.pc
 usr/lib/*/pkgconfig/ndr_standard.pc
+usr/lib/*/pkgconfig/netapi.pc
 usr/lib/*/pkgconfig/registry.pc
 usr/lib/*/pkgconfig/samba-credentials.pc
 usr/lib/*/pkgconfig/samba-hostconfig.pc
@@ -142,6 +145,3 @@ 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 461d627..226c27f 100644
--- a/debian/samba-libs.install
+++ b/debian/samba-libs.install
@@ -8,6 +8,7 @@ usr/lib/*/libndr-krb5pac.so.*
 usr/lib/*/libndr-nbt.so.0*
 usr/lib/*/libndr-standard.so.*
 usr/lib/*/libndr.so.*
+usr/lib/*/libnetapi.so.0
 usr/lib/*/libpdb.so.0
 usr/lib/*/libregistry.so.*
 usr/lib/*/libsamba-credentials.so.0*
@@ -144,4 +145,3 @@ 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