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

Jelmer Vernooij jelmer at alioth.debian.org
Sun Aug 11 16:11:37 UTC 2013


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

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

commit 0b46d1dc49e90cd82c0442454232d17a4fdc6bcd
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Aug 11 16:06:48 2013 +0000

    wrap-and-sort
---
 debian/control                      |  220 ++++++++++++++++++++++++-----------
 debian/libgensec0.install           |    2 +-
 debian/libndr-standard0.install     |    2 +-
 debian/libnetapi-dev.install        |    2 +-
 debian/libpam-winbind.install       |    4 +-
 debian/libsamba-heimdal.install     |   38 +++---
 debian/libsamba-util0.install       |    2 +-
 debian/libsmbclient-dev.install     |    2 +-
 debian/libsmbclient-raw0.install    |    2 +-
 debian/libsmbd0.install             |    4 +-
 debian/libsmbsharemodes-dev.install |    2 +-
 debian/libwbclient-dev.install      |    2 +-
 debian/samba-common-bin.install     |   24 ++--
 debian/samba-common.install         |    4 +-
 debian/samba-dev.install            |   12 +-
 debian/samba-doc.install            |    1 +
 debian/samba-testsuite.install      |    2 +-
 debian/samba.install                |   12 +-
 debian/samba4-clients.install       |    2 +-
 debian/smbclient.install            |   18 +--
 debian/winbind.install              |   10 +-
 21 files changed, 227 insertions(+), 140 deletions(-)

diff --git a/debian/control b/debian/control
index 18832a4..8772cd7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,22 +2,77 @@ Source: samba
 Section: net
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
-Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Jelmer Vernooij <jelmer at debian.org>, Steinar H. Gunderson <sesse at debian.org>,
+Uploaders: Steve Langasek <vorlon at debian.org>,
+           Christian Perrier <bubulle at debian.org>,
+           Noèl Köthe <noel at debian.org>,
+           Jelmer Vernooij <jelmer at debian.org>,
+           Steinar H. Gunderson <sesse at debian.org>,
 Homepage: http://www.samba.org
 Standards-Version: 3.9.3
-Build-Depends: bison, comerr-dev, debhelper (>> 9), docbook-xml, docbook-xsl, flex, heimdal-multidev (>= 1.6~), libattr1-dev, libacl1-dev, libblkid-dev, libbsd-dev, libgnutls-dev, libheimntlm0-heimdal (>= 1.6~), libldap2-dev, libldb-dev (>= 1:1.1.16~), libpam0g-dev, libparse-yapp-perl, libpopt-dev, libreadline-dev, libsubunit-dev, libtalloc-dev (>= 2.0.7~), libtdb-dev (>= 1.2.11~), libtevent-dev (>= 0.9.18~), libctdb-dev (>= 1.10+git20110412), perl, perl-modules, pkg-config, po-debconf,  [...]
+Build-Depends: bison,
+               comerr-dev,
+               debhelper (>> 9),
+               docbook-xml,
+               docbook-xsl,
+               flex,
+               heimdal-multidev (>= 1.6~),
+               libacl1-dev,
+               libattr1-dev,
+               libblkid-dev,
+               libbsd-dev,
+               libctdb-dev (>= 1.10+git20110412),
+               libgnutls-dev,
+               libheimntlm0-heimdal (>= 1.6~),
+               libldap2-dev,
+               libldb-dev (>= 1:1.1.16~),
+               libpam0g-dev,
+               libparse-yapp-perl,
+               libpopt-dev,
+               libreadline-dev,
+               libsubunit-dev,
+               libtalloc-dev (>= 2.0.7~),
+               libtdb-dev (>= 1.2.11~),
+               libtevent-dev (>= 0.9.18~),
+               perl,
+               perl-modules,
+               pkg-config,
+               po-debconf,
+               python-all-dev (>= 2.6.6-3),
+               python-dnspython,
+               python-ldb (>= 1:1.1.16~),
+               python-ldb-dev (>= 1:1.1.16~),
+               python-talloc-dev (>= 2.0.7~),
+               python-tdb (>= 1.2.11~),
+               python-testtools,
+               subunit (>= 0.0.6),
+               xsltproc,
+               zlib1g-dev (>= 1:1.2.3)
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-samba/samba4.git
 Vcs-Git: git://git.debian.org/pkg-samba/samba4
 XS-Testsuite: autopkgtest
 
 Package: samba
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~)
-Depends: samba-common (= ${source:Version}), libwbclient0 (= ${binary:Version}),${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-11), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser, libsmbd0 (= ${binary:Version})
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: adduser,
+         libpam-modules,
+         libpam-runtime (>= 1.0.1-11),
+         libsmbd0 (= ${binary:Version}),
+         libwbclient0 (= ${binary:Version}),
+         lsb-base (>= 3.2-13),
+         procps,
+         samba-common (= ${source:Version}),
+         update-inetd,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: logrotate, tdb-tools
-Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools, ctdb, winbind
+Suggests: ctdb,
+          ldb-tools,
+          openbsd-inetd | inet-superserver,
+          smbldap-tools,
+          winbind
 Replaces: samba-common (<= 2.0.5a-2), samba-doc (<< 2:4.0.5~)
-Conflicts: samba4 (<< 4.0.0~alpha6-2), samba-doc (<< 2:4.0.5~)
+Conflicts: samba-doc (<< 2:4.0.5~), samba4 (<< 4.0.0~alpha6-2)
 Description: SMB/CIFS file, print, and login server for Unix
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with
@@ -35,16 +90,19 @@ Description: SMB/CIFS file, print, and login server for Unix
 Package: samba-ad-dc
 Architecture: any
 Recommends: attr, bind9 (>= 1:9.5.1), bind9utils, ldb-tools
-Suggests: samba-gtk, swat2, ntp
-Enhances: ntp, bind9
-Conflicts: samba (<< 2:3.3.0~rc2-5), samba-tools, libldb1 (<< 1:1.1.15), samba-doc (<< 2:4.0.5~)
-Replaces: libsamdb0 (<< 4.0.0~alpha17~), samba4, samba-doc (<< 2:4.0.5~)
-Depends: samba,
-         python,
+Suggests: ntp, samba-gtk, swat2
+Enhances: bind9, ntp
+Conflicts: libldb1 (<< 1:1.1.15),
+           samba (<< 2:3.3.0~rc2-5),
+           samba-doc (<< 2:4.0.5~),
+           samba-tools
+Replaces: libsamdb0 (<< 4.0.0~alpha17~), samba-doc (<< 2:4.0.5~), samba4
+Depends: python,
          python-dnspython,
          python-samba,
-         samba-dsdb-modules,
+         samba,
          samba-common-bin (=${binary:Version}),
+         samba-dsdb-modules,
          tdb-tools,
          ${misc:Depends},
          ${python:Depends},
@@ -90,7 +148,9 @@ Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: samba (<< ${binary:Version}), samba-doc (<< 2:4.0.5~), python-samba (<< 2:4.0.6~)
+Replaces: python-samba (<< 2:4.0.6~),
+          samba (<< ${binary:Version}),
+          samba-doc (<< 2:4.0.5~)
 Conflicts: samba-doc (<< 2:4.0.5~)
 Breaks: samba (<< ${binary:Version})
 Description: Samba file server libraries and plugins
@@ -130,10 +190,12 @@ Description: Samba policy management - development files
 Package: samba-common
 Architecture: all
 Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~)
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ucf, ${misc:Depends}
-Replaces: samba (<< 3.0.20b-1), samba4-common (<< 4.0.0~alpha7-1), samba-doc (<< 2:4.0.5~)
-Conflicts: samba4-common (<< 4.0.0~alpha7-1), samba-doc (<< 2:4.0.5~), swat
+Replaces: samba (<< 3.0.20b-1),
+          samba-doc (<< 2:4.0.5~),
+          samba4-common (<< 4.0.0~alpha7-1)
+Conflicts: samba-doc (<< 2:4.0.5~), samba4-common (<< 4.0.0~alpha7-1), swat
 Recommends: samba-common-bin
 Description: common files used by both the Samba server and client
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -144,14 +206,20 @@ Description: common files used by both the Samba server and client
 
 Package: samba-common-bin
 Architecture: any
-Depends: samba-common (=${source:Version}),
-         python,
+Depends: python,
          python-samba,
-         ${shlibs:Depends},
+         samba-common (=${source:Version}),
          ${misc:Depends},
-         ${python:Depends}
-Conflicts: samba (<< 2:3.3.0~rc2-5), samba-common (<< 2:3.3.0~rc2-5), samba-doc (<< 2:4.0.5~)
-Replaces: samba-common (<< 2:3.4.0~pre2-1), samba4-common (<< 4.0.0~alpha7-1), samba4-common-bin, samba-doc (<< 2:4.0.5~), python-samba (<< 2:4.0.6~)
+         ${python:Depends},
+         ${shlibs:Depends}
+Conflicts: samba (<< 2:3.3.0~rc2-5),
+           samba-common (<< 2:3.3.0~rc2-5),
+           samba-doc (<< 2:4.0.5~)
+Replaces: python-samba (<< 2:4.0.6~),
+          samba-common (<< 2:3.4.0~pre2-1),
+          samba-doc (<< 2:4.0.5~),
+          samba4-common (<< 4.0.0~alpha7-1),
+          samba4-common-bin
 Suggests: heimdal-clients
 Description: Samba common files used by both the server and the client
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -165,12 +233,15 @@ Description: Samba common files used by both the server and the client
 
 Package: smbclient
 Architecture: any
-Depends: samba-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: samba-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: dpkg (>= 1.15.6~)
-Replaces: samba (<< 2.999+3.0.alpha21-4), samba4-clients (<< 4.0.5), smbget, samba-doc (<< 2:4.0.5~)
+Replaces: samba (<< 2.999+3.0.alpha21-4),
+          samba-doc (<< 2:4.0.5~),
+          samba4-clients (<< 4.0.5),
+          smbget
 Provides: samba-client
 Suggests: cifs-utils, heimdal-clients
-Conflicts: samba4-clients (<< 4.0.5), samba-doc (<< 2:4.0.5~)
+Conflicts: samba-doc (<< 2:4.0.5~), samba4-clients (<< 4.0.5)
 Description: command-line SMB/CIFS clients for Unix
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with
@@ -184,9 +255,9 @@ Description: command-line SMB/CIFS clients for Unix
 Package: samba4-clients
 Architecture: any
 Depends: samba-common-bin (=${binary:Version}),
+         smbclient,
          ${misc:Depends},
-         ${shlibs:Depends},
-         smbclient
+         ${shlibs:Depends}
 Replaces: samba-doc (<< 2:4.0.5~)
 Conflicts: samba-common (<< 2:3.3.0~rc2-5), samba-doc (<< 2:4.0.5~)
 Description: client utilities from Samba
@@ -202,7 +273,7 @@ Description: client utilities from Samba
 Package: samba-testsuite
 Architecture: any
 Recommends: subunit
-Replaces: samba4-testsuite, samba-tools, samba-doc (<< 2:4.0.5~)
+Replaces: samba-doc (<< 2:4.0.5~), samba-tools, samba4-testsuite
 Conflicts: samba-doc (<< 2:4.0.5~)
 Depends: samba-common-bin, ${misc:Depends}, ${shlibs:Depends}
 Description: test suite from Samba
@@ -541,15 +612,15 @@ Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
 Section: python
 Provides: ${python:Provides}
-Depends: python-ldb,
-         python-tdb,
-         ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends},
+Depends: libnetapi0 (=${binary:Version}),
          libsamba-hostconfig0 (=${binary:Version}),
          libsamba-util0 (=${binary:Version}),
          libsmbd0 (=${binary:Version}),
-         libnetapi0 (=${binary:Version})
+         python-ldb,
+         python-tdb,
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Description: Python bindings for 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,
@@ -669,8 +740,10 @@ Section: admin
 Priority: extra
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, samba-common (= ${source:Version}), ${misc:Depends},
-     libpam-runtime (>= 1.0.1-6)
+Depends: libpam-runtime (>= 1.0.1-6),
+         samba-common (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Pre-Depends: dpkg (>= 1.15.6~)
 Suggests: samba
 Description: pluggable authentication module for Samba
@@ -686,8 +759,8 @@ Section: libs
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: samba-doc (<< 2:4.0.5~)
 Conflicts: samba-doc (<< 2:4.0.5~)
 Description: shared library for communication with SMB/CIFS servers
@@ -713,11 +786,11 @@ Section: libs
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+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 
+ 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.
 
@@ -731,7 +804,7 @@ 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 
+ 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.
 
@@ -740,8 +813,8 @@ Section: libs
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: shared library for non-samba access to the samba 'share modes' database
  This package provides libsmbsharemodes, a library that
  enables server applications to honour or apply the share modes that are used over CIFS.
@@ -763,9 +836,9 @@ Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
 Depends: samba (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Enhances: libkrb5-26-heimdal
-Replaces: winbind4, samba-doc (<< 2:4.0.5~)
+Replaces: samba-doc (<< 2:4.0.5~), winbind4
 Conflicts: samba-doc (<< 2:4.0.5~)
-Suggests: libpam-winbind, libnss-winbind
+Suggests: libnss-winbind, libpam-winbind
 Description: service to resolve user and group information from Windows NT servers
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file sharing with Microsoft Windows, OS X,
@@ -785,12 +858,20 @@ Section: net
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends}, ${misc:Depends}, winbind (= ${binary:Version}), libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}),
-     libpam-runtime (>= 1.0.1-6), libpam0g (>= 1.1.3-2~)
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: libpam-runtime (>= 1.0.1-6),
+         libpam0g (>= 1.1.3-2~),
+         libwbclient0 (= ${binary:Version}),
+         samba-common (= ${source:Version}),
+         winbind (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: libnss-winbind
 Breaks: winbind (<< 2:3.5.11~dfsg-3)
-Replaces: samba (<= 2.2.3-2), winbind (<< 2:3.5.11~dfsg-3), winbind4, samba-doc (<< 2:4.0.5~)
+Replaces: samba (<= 2.2.3-2),
+          samba-doc (<< 2:4.0.5~),
+          winbind (<< 2:3.5.11~dfsg-3),
+          winbind4
 Conflicts: samba-doc (<< 2:4.0.5~)
 Description: Windows domain authentication integration plugin
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -808,9 +889,16 @@ Priority: optional
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends}, ${misc:Depends}, winbind (= ${binary:Version}), libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version})
+Depends: libwbclient0 (= ${binary:Version}),
+         samba-common (= ${source:Version}),
+         winbind (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: libpam-winbind (<< 2:3.6.5-2), winbind (<< 2:3.5.11~dfsg-3)
-Replaces: libpam-winbind (<< 2:3.6.5-2), samba (<= 2.2.3-2), winbind (<< 2:3.5.11~dfsg-3), winbind4
+Replaces: libpam-winbind (<< 2:3.6.5-2),
+          samba (<= 2.2.3-2),
+          winbind (<< 2:3.5.11~dfsg-3),
+          winbind4
 Suggests: libpam-winbind
 Description: Samba nameservice integration plugins
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -844,18 +932,17 @@ Section: libs
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~)
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks:
- libpam-smbpass (<< 2:3.4.1),
- libsmbclient (<< 2:3.4.1),
- samba-common (<< 2:3.4.1),
- samba-tools (<< 2:3.4.1),
- samba (<< 2:3.4.1),
- smbclient (<< 2:3.4.1),
- smbfs (<< 2:3.4.1),
- swat (<< 2:3.4.1),
- winbind (<< 2:3.4.1),
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libpam-smbpass (<< 2:3.4.1),
+        libsmbclient (<< 2:3.4.1),
+        samba (<< 2:3.4.1),
+        samba-common (<< 2:3.4.1),
+        samba-tools (<< 2:3.4.1),
+        smbclient (<< 2:3.4.1),
+        smbfs (<< 2:3.4.1),
+        swat (<< 2:3.4.1),
+        winbind (<< 2:3.4.1)
 Description: Samba winbind client library
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with
@@ -869,7 +956,7 @@ Section: libdevel
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version})
+Depends: libwbclient0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: dpkg (>= 1.15.6~)
 Description: Samba winbind client library - development files
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -880,4 +967,3 @@ Description: Samba winbind client library - development files
  required for building applications against libwbclient, a library for client
  applications that interact via the winbind pipe protocol with a Samba
  winbind server.
-
diff --git a/debian/libgensec0.install b/debian/libgensec0.install
index 16d0694..e70c7fe 100644
--- a/debian/libgensec0.install
+++ b/debian/libgensec0.install
@@ -11,5 +11,5 @@ usr/lib/*/samba/libcliauth.so
 usr/lib/*/samba/libcmdline-credentials.so
 usr/lib/*/samba/libdb-glue.so
 usr/lib/*/samba/libkrb5samba.so
-usr/lib/*/samba/libwinbind-client.so
 usr/lib/*/samba/libsmb_transport.so
+usr/lib/*/samba/libwinbind-client.so
diff --git a/debian/libndr-standard0.install b/debian/libndr-standard0.install
index 94e811b..1f9cd7a 100644
--- a/debian/libndr-standard0.install
+++ b/debian/libndr-standard0.install
@@ -4,6 +4,6 @@ usr/lib/*/libndr-standard.so.*
 usr/lib/*/samba/libndr-samba.so
 usr/lib/*/samba/libndr-samba4.so
 usr/lib/*/samba/libnpa_tstream.so
+usr/lib/*/samba/libsamba-security.so
 usr/lib/*/samba/libsamba-sockets.so
 usr/lib/*/samba/libxattr_tdb.so
-usr/lib/*/samba/libsamba-security.so
diff --git a/debian/libnetapi-dev.install b/debian/libnetapi-dev.install
index 6ea3d46..b899b76 100644
--- a/debian/libnetapi-dev.install
+++ b/debian/libnetapi-dev.install
@@ -1,3 +1,3 @@
 usr/include/samba-4.0/netapi.h
-usr/lib/*/pkgconfig/netapi.pc
 usr/lib/*/libnetapi.so
+usr/lib/*/pkgconfig/netapi.pc
diff --git a/debian/libpam-winbind.install b/debian/libpam-winbind.install
index 69b161c..a8aa8df 100644
--- a/debian/libpam-winbind.install
+++ b/debian/libpam-winbind.install
@@ -1,4 +1,4 @@
-usr/share/man/man8/pam_winbind.8
 lib/*/security/pam_winbind.so
-usr/share/pam-configs/winbind
 usr/share/man/man5/pam_winbind.conf.5
+usr/share/man/man8/pam_winbind.8
+usr/share/pam-configs/winbind
diff --git a/debian/libsamba-heimdal.install b/debian/libsamba-heimdal.install
index 3140b91..34ce807 100644
--- a/debian/libsamba-heimdal.install
+++ b/debian/libsamba-heimdal.install
@@ -1,23 +1,23 @@
-usr/lib/*/samba/libgssapi-samba4.so.2.0.0
-usr/lib/*/samba/libgssapi-samba4.so.2
-usr/lib/*/samba/libkrb5-samba4.so.26.0.0
-usr/lib/*/samba/libkrb5-samba4.so.26
-usr/lib/*/samba/libheimbase-samba4.so.1.0.0
-usr/lib/*/samba/libheimbase-samba4.so.1
-usr/lib/*/samba/libroken-samba4.so.19.0.1
-usr/lib/*/samba/libroken-samba4.so.19
-usr/lib/*/samba/libasn1-samba4.so.8.0.0
+
 usr/lib/*/samba/libasn1-samba4.so.8
-usr/lib/*/samba/libhx509-samba4.so.5.0.0
-usr/lib/*/samba/libhx509-samba4.so.5
-usr/lib/*/samba/libhcrypto-samba4.so.5.0.1
+usr/lib/*/samba/libasn1-samba4.so.8.0.0
+usr/lib/*/samba/libgssapi-samba4.so.2
+usr/lib/*/samba/libgssapi-samba4.so.2.0.0
 usr/lib/*/samba/libhcrypto-samba4.so.5
-usr/lib/*/samba/libwind-samba4.so.0.0.0
-usr/lib/*/samba/libwind-samba4.so.0
-usr/lib/*/samba/libhdb-samba4.so.11.0.2
+usr/lib/*/samba/libhcrypto-samba4.so.5.0.1
 usr/lib/*/samba/libhdb-samba4.so.11
-usr/lib/*/samba/libkdc-samba4.so.2.0.0
-usr/lib/*/samba/libkdc-samba4.so.2
-usr/lib/*/samba/libheimntlm-samba4.so.1.0.1
+usr/lib/*/samba/libhdb-samba4.so.11.0.2
+usr/lib/*/samba/libheimbase-samba4.so.1
+usr/lib/*/samba/libheimbase-samba4.so.1.0.0
 usr/lib/*/samba/libheimntlm-samba4.so.1
-
+usr/lib/*/samba/libheimntlm-samba4.so.1.0.1
+usr/lib/*/samba/libhx509-samba4.so.5
+usr/lib/*/samba/libhx509-samba4.so.5.0.0
+usr/lib/*/samba/libkdc-samba4.so.2
+usr/lib/*/samba/libkdc-samba4.so.2.0.0
+usr/lib/*/samba/libkrb5-samba4.so.26
+usr/lib/*/samba/libkrb5-samba4.so.26.0.0
+usr/lib/*/samba/libroken-samba4.so.19
+usr/lib/*/samba/libroken-samba4.so.19.0.1
+usr/lib/*/samba/libwind-samba4.so.0
+usr/lib/*/samba/libwind-samba4.so.0.0.0
diff --git a/debian/libsamba-util0.install b/debian/libsamba-util0.install
index ce53ff4..eb0a573 100644
--- a/debian/libsamba-util0.install
+++ b/debian/libsamba-util0.install
@@ -9,5 +9,5 @@ usr/lib/*/samba/libinterfaces.so
 usr/lib/*/samba/libsamba-modules.so
 usr/lib/*/samba/libsamba3-util.so
 usr/lib/*/samba/libsmbpasswdparser.so
-usr/lib/*/samba/libutil_tdb.so
 usr/lib/*/samba/libutil_setid.so
+usr/lib/*/samba/libutil_tdb.so
diff --git a/debian/libsmbclient-dev.install b/debian/libsmbclient-dev.install
index 53e51c8..e13d6dc 100644
--- a/debian/libsmbclient-dev.install
+++ b/debian/libsmbclient-dev.install
@@ -1,3 +1,3 @@
-usr/lib/*/libsmbclient.so
 usr/include/samba-4.0/libsmbclient.h
+usr/lib/*/libsmbclient.so
 usr/lib/*/pkgconfig/smbclient.pc
diff --git a/debian/libsmbclient-raw0.install b/debian/libsmbclient-raw0.install
index 293566d..52f90fe 100644
--- a/debian/libsmbclient-raw0.install
+++ b/debian/libsmbclient-raw0.install
@@ -1,9 +1,9 @@
 usr/lib/*/libsmbclient-raw.so.0*
 usr/lib/*/libsmbconf.so.0
 usr/lib/*/samba/libCHARSET3.so
+usr/lib/*/samba/libaddns.so
 usr/lib/*/samba/libgse.so
 usr/lib/*/samba/liblibsmb.so
 usr/lib/*/samba/libsecrets3.so
 usr/lib/*/samba/libsmbregistry.so
 usr/lib/*/samba/libutil_cmdline.so
-usr/lib/*/samba/libaddns.so
diff --git a/debian/libsmbd0.install b/debian/libsmbd0.install
index 7266403..a6a4fa5 100644
--- a/debian/libsmbd0.install
+++ b/debian/libsmbd0.install
@@ -1,8 +1,8 @@
+usr/lib/*/samba/auth/
+usr/lib/*/samba/libauth.so
 usr/lib/*/samba/libsmbd_base.so
 usr/lib/*/samba/libsmbd_conn.so
 usr/lib/*/samba/libsmbd_shim.so
-usr/lib/*/samba/libauth.so
-usr/lib/*/samba/auth/
 usr/lib/*/samba/vfs/*.so
 usr/share/man/man8/vfs_acl_tdb.8
 usr/share/man/man8/vfs_acl_xattr.8
diff --git a/debian/libsmbsharemodes-dev.install b/debian/libsmbsharemodes-dev.install
index 6baa9b2..0b1227c 100644
--- a/debian/libsmbsharemodes-dev.install
+++ b/debian/libsmbsharemodes-dev.install
@@ -1,3 +1,3 @@
+usr/include/samba-4.0/smb_share_modes.h
 usr/lib/*/libsmbsharemodes.so
 usr/lib/*/pkgconfig/smbsharemodes.pc
-usr/include/samba-4.0/smb_share_modes.h
diff --git a/debian/libwbclient-dev.install b/debian/libwbclient-dev.install
index 22ae273..5e932c0 100644
--- a/debian/libwbclient-dev.install
+++ b/debian/libwbclient-dev.install
@@ -1,3 +1,3 @@
-usr/lib/*/libwbclient.so
 usr/include/samba-4.0/wbclient.h
+usr/lib/*/libwbclient.so
 usr/lib/*/pkgconfig/wbclient.pc
diff --git a/debian/samba-common-bin.install b/debian/samba-common-bin.install
index f6d61a5..9d55c17 100644
--- a/debian/samba-common-bin.install
+++ b/debian/samba-common-bin.install
@@ -1,14 +1,14 @@
+usr/bin/dbwrap_tool
 usr/bin/net
 usr/bin/nmblookup
+usr/bin/samba-tool
 usr/bin/smbpasswd
 usr/bin/testparm
-usr/bin/dbwrap_tool
-usr/lib/tmpfiles.d/samba.conf
 usr/lib/*/libpdb.so.0
 usr/lib/*/libsmbldap.so.0
 usr/lib/*/samba/libads.so
-usr/lib/*/samba/libdbwrap.so
 usr/lib/*/samba/libcli_spoolss.so
+usr/lib/*/samba/libdbwrap.so
 usr/lib/*/samba/libgpo.so
 usr/lib/*/samba/liblibcli_lsa3.so
 usr/lib/*/samba/liblibcli_netlogon3.so
@@ -19,17 +19,17 @@ usr/lib/*/samba/libprinting_migrate.so
 usr/lib/*/samba/libsmbldaphelper.so
 usr/lib/*/samba/libtdb_compat.so
 usr/lib/*/samba/libtrusts_util.so
-usr/bin/samba-tool
+usr/lib/tmpfiles.d/samba.conf
 usr/sbin/samba_kcc
-usr/share/samba/addshare.py
-usr/share/samba/setoption.py
-usr/share/man/man8/samba-tool.8
-usr/share/man/man1/testparm.1
-usr/share/man/man1/nmblookup.1
 usr/share/man/man1/dbwrap_tool.1
-usr/share/man/man5/smb.conf.5
+usr/share/man/man1/nmblookup.1
+usr/share/man/man1/testparm.1
 usr/share/man/man5/lmhosts.5
+usr/share/man/man5/smb.conf.5
 usr/share/man/man5/smbpasswd.5
-usr/share/man/man8/smbpasswd.8
-usr/share/man/man8/net.8
 usr/share/man/man7/samba.7
+usr/share/man/man8/net.8
+usr/share/man/man8/samba-tool.8
+usr/share/man/man8/smbpasswd.8
+usr/share/samba/addshare.py
+usr/share/samba/setoption.py
diff --git a/debian/samba-common.install b/debian/samba-common.install
index fc97628..3b12f62 100644
--- a/debian/samba-common.install
+++ b/debian/samba-common.install
@@ -1,6 +1,6 @@
+etc/dhcp3/
 etc/samba/
 etc/samba/gdbcommands
-etc/dhcp3/
+usr/share/samba/codepages/*.dat
 usr/share/samba/panic-action
 usr/share/samba/smb.conf*
-usr/share/samba/codepages/*.dat
diff --git a/debian/samba-dev.install b/debian/samba-dev.install
index 581d969..9978780 100644
--- a/debian/samba-dev.install
+++ b/debian/samba-dev.install
@@ -25,10 +25,16 @@ usr/include/samba-4.0/ldap_errors.h
 usr/include/samba-4.0/ldap_message.h
 usr/include/samba-4.0/ldap_ndr.h
 usr/include/samba-4.0/ldb_wrap.h
+usr/include/samba-4.0/lookup_sid.h
+usr/include/samba-4.0/machine_sid.h
 usr/include/samba-4.0/ndr/ndr_svcctl.h
+usr/include/samba-4.0/passdb.h
 usr/include/samba-4.0/roles.h
 usr/include/samba-4.0/samba/session.h
 usr/include/samba-4.0/samba/version.h
+usr/include/samba-4.0/smb_ldap.h
+usr/include/samba-4.0/smbconf.h
+usr/include/samba-4.0/smbldap.h
 usr/include/samba-4.0/tdr.h
 usr/include/samba-4.0/tsocket.h
 usr/include/samba-4.0/tsocket_internal.h
@@ -36,11 +42,5 @@ usr/include/samba-4.0/util/attr.h
 usr/include/samba-4.0/util/tevent_ntstatus.h
 usr/include/samba-4.0/util/tevent_unix.h
 usr/include/samba-4.0/util_ldb.h
-usr/include/samba-4.0/passdb.h
-usr/include/samba-4.0/machine_sid.h
-usr/include/samba-4.0/lookup_sid.h
-usr/include/samba-4.0/smbldap.h
-usr/include/samba-4.0/smb_ldap.h
-usr/include/samba-4.0/smbconf.h
 usr/lib/*/libpdb.so
 usr/lib/*/libsmbldap.so
diff --git a/debian/samba-doc.install b/debian/samba-doc.install
index e69de29..8b13789 100644
--- a/debian/samba-doc.install
+++ b/debian/samba-doc.install
@@ -0,0 +1 @@
+
diff --git a/debian/samba-testsuite.install b/debian/samba-testsuite.install
index 80dc103..5ab1799 100644
--- a/debian/samba-testsuite.install
+++ b/debian/samba-testsuite.install
@@ -3,9 +3,9 @@ usr/bin/locktest
 usr/bin/masktest
 usr/bin/ndrdump
 usr/bin/smbtorture
+usr/lib/*/samba/libdlz_bind9_for_torture.so
 usr/share/man/man1/gentest.1
 usr/share/man/man1/locktest.1
 usr/share/man/man1/masktest.1
 usr/share/man/man1/ndrdump.1
 usr/share/man/man1/smbtorture.1
-usr/lib/*/samba/libdlz_bind9_for_torture.so
diff --git a/debian/samba.install b/debian/samba.install
index 23c9908..a4f891f 100644
--- a/debian/samba.install
+++ b/debian/samba.install
@@ -1,15 +1,15 @@
 lib/systemd/system/nmb.service
 lib/systemd/system/smb.service
 usr/bin/eventlogadm
-usr/bin/smbstatus
-usr/bin/smbcontrol
-usr/bin/profiles
 usr/bin/pdbedit
-usr/sbin/nmbd
-usr/sbin/smbd
-usr/sbin/mksmbpasswd
+usr/bin/profiles
 usr/bin/sharesec
+usr/bin/smbcontrol
+usr/bin/smbstatus
 usr/bin/smbta-util
+usr/sbin/mksmbpasswd
+usr/sbin/nmbd
+usr/sbin/smbd
 usr/share/man/man1/log2pcap.1
 usr/share/man/man1/profiles.1
 usr/share/man/man1/sharesec.1
diff --git a/debian/samba4-clients.install b/debian/samba4-clients.install
index fd6b3f0..d2a94b5 100644
--- a/debian/samba4-clients.install
+++ b/debian/samba4-clients.install
@@ -1,3 +1,3 @@
-usr/bin/smbclient4
 usr/bin/nmblookup4
+usr/bin/smbclient4
 usr/share/man/man1/nmblookup4.1
diff --git a/debian/smbclient.install b/debian/smbclient.install
index 6221ac2..c73f865 100644
--- a/debian/smbclient.install
+++ b/debian/smbclient.install
@@ -1,19 +1,19 @@
+usr/bin/cifsdd
+usr/bin/rpcclient
+usr/bin/smbcacls
 usr/bin/smbclient
+usr/bin/smbcquotas
 usr/bin/smbget
-usr/bin/smbtar
-usr/bin/rpcclient
 usr/bin/smbspool
+usr/bin/smbtar
 usr/bin/smbtree
-usr/bin/smbcacls
-usr/bin/smbcquotas
-usr/bin/cifsdd
 usr/share/man/man1/findsmb.1
+usr/share/man/man1/rpcclient.1
+usr/share/man/man1/smbcacls.1
 usr/share/man/man1/smbclient.1
+usr/share/man/man1/smbcquotas.1
 usr/share/man/man1/smbget.1
 usr/share/man/man1/smbtar.1
-usr/share/man/man1/rpcclient.1
+usr/share/man/man1/smbtree.1
 usr/share/man/man5/smbgetrc.5
 usr/share/man/man8/smbspool.8
-usr/share/man/man1/smbcacls.1
-usr/share/man/man1/smbcquotas.1
-usr/share/man/man1/smbtree.1
diff --git a/debian/winbind.install b/debian/winbind.install
index da6ca7a..64edcb7 100644
--- a/debian/winbind.install
+++ b/debian/winbind.install
@@ -1,15 +1,14 @@
 lib/systemd/system/winbind.service
+usr/bin/ntlm_auth
+usr/bin/wbinfo
+usr/lib/*/plugin/krb5/winbind_krb5_locator.so
 usr/lib/*/samba/idmap
-usr/lib/*/samba/nss_info
 usr/lib/*/samba/libidmap.so
 usr/lib/*/samba/libnss_info.so
-usr/bin/ntlm_auth
-usr/bin/wbinfo
+usr/lib/*/samba/nss_info
 usr/sbin/winbindd
-usr/lib/*/plugin/krb5/winbind_krb5_locator.so
 usr/share/man/man1/ntlm_auth.1
 usr/share/man/man1/wbinfo.1
-usr/share/man/man8/winbindd.8
 usr/share/man/man7/winbind_krb5_locator.7
 usr/share/man/man8/idmap_ad.8
 usr/share/man/man8/idmap_autorid.8
@@ -19,3 +18,4 @@ usr/share/man/man8/idmap_nss.8
 usr/share/man/man8/idmap_rid.8
 usr/share/man/man8/idmap_tdb.8
 usr/share/man/man8/idmap_tdb2.8
+usr/share/man/man8/winbindd.8

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




More information about the Pkg-samba-maint mailing list