[Pkg-samba-maint] [samba] 07/16: wrap-and-sort
Mathieu Parent
sathieu at moszumanska.debian.org
Thu Jun 8 21:29:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
sathieu pushed a commit to branch master
in repository samba.
commit 8d0516a1600463223bb9a516d627276a2b2df41b
Author: Mathieu Parent <math.parent at gmail.com>
Date: Thu Jun 8 09:55:57 2017 +0200
wrap-and-sort
---
debian/control | 61 ++++++++++++++++++++++++++----------------
debian/ctdb.install | 6 ++---
debian/samba-dev.install | 2 +-
debian/samba-libs.install | 8 +++---
debian/samba-testsuite.install | 2 +-
debian/samba.install | 6 ++---
debian/smbclient.install | 2 +-
debian/winbind.install | 2 +-
8 files changed, 52 insertions(+), 37 deletions(-)
diff --git a/debian/control b/debian/control
index ac6f265..9c214e5 100644
--- a/debian/control
+++ b/debian/control
@@ -80,8 +80,8 @@ Suggests: bind9 (>= 1:9.5.1),
ldb-tools,
ntp | chrony (>= 3.0-1),
smbldap-tools,
- winbind,
- ufw
+ ufw,
+ winbind
Enhances: bind9, ntp
Breaks: qtsmbstatus-server (<< 2.2.1-3~)
Replaces: python-samba (<< 2:4.1.4+dfsg-3),
@@ -167,8 +167,7 @@ Architecture: all
Multi-Arch: foreign
Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
Depends: ucf, ${misc:Depends}
-Replaces: samba (<< 3.0.20b-1),
- samba-doc (<< 2:4.0.5~)
+Replaces: samba (<< 3.0.20b-1), samba-doc (<< 2:4.0.5~)
Conflicts: samba-doc (<< 2:4.0.5~), swat
Recommends: samba-common-bin
Description: common files used by both the Samba server and client
@@ -183,9 +182,10 @@ Architecture: any
Depends: python,
python-samba,
samba-common (=${source:Version}),
+ samba-libs (= ${binary:Version}),
${misc:Depends},
${python:Depends},
- ${shlibs:Depends}, samba-libs (= ${binary:Version})
+ ${shlibs:Depends}
Conflicts: samba-doc (<< 2:4.0.5~)
Replaces: python-samba (<< 2:4.0.6~),
samba-doc (<< 2:4.0.5~),
@@ -203,11 +203,12 @@ Description: Samba common files used by both the server and the client
Package: smbclient
Architecture: any
-Depends: samba-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}, samba-libs (= ${binary:Version})
+Depends: samba-common (= ${source:Version}),
+ samba-libs (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Pre-Depends: dpkg (>= 1.15.6~)
-Replaces: samba-doc (<< 2:4.0.5~),
- samba4-clients (<< 4.0.5),
- smbget
+Replaces: samba-doc (<< 2:4.0.5~), samba4-clients (<< 4.0.5), smbget
Provides: samba-client
Suggests: cifs-utils, heimdal-clients
Conflicts: samba-doc (<< 2:4.0.5~), samba4-clients (<< 4.0.5)
@@ -229,7 +230,10 @@ Replaces: samba-doc (<< 2:4.0.5~),
samba-tools,
samba4-testsuite
Conflicts: samba-doc (<< 2:4.0.5~), samba-libs (<< 2:4.0.10+dfsg-4)
-Depends: samba-common-bin, ${misc:Depends}, ${shlibs:Depends}, samba-libs (= ${binary:Version})
+Depends: samba-common-bin,
+ samba-libs (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: test suite from 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,
@@ -241,7 +245,7 @@ Description: test suite from Samba
Package: registry-tools
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, samba-libs (= ${binary:Version})
+Depends: samba-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Replaces: samba-doc (<< 2:4.0.5~)
Conflicts: samba-doc (<< 2:4.0.5~)
Description: tools for viewing and manipulating the Windows registry
@@ -330,9 +334,10 @@ Suggests: python-gpgme
Depends: python-crypto,
python-ldb,
python-tdb,
+ samba-libs (= ${binary:Version}),
${misc:Depends},
${python:Depends},
- ${shlibs:Depends}, samba-libs (= ${binary:Version})
+ ${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,
@@ -346,7 +351,11 @@ Architecture: any
Replaces: samba-libs (<< 2:4.1.9+dfsg-2)
Breaks: samba-libs (<< 2:4.1.9+dfsg-2)
Section: libs
-Depends: libgpgme11, ${misc:Depends}, ${shlibs:Depends}, ${ldb:Depends}, samba-libs (= ${binary:Version})
+Depends: libgpgme11,
+ samba-libs (= ${binary:Version}),
+ ${ldb:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
Enhances: libldb1
Description: Samba Directory Services Database
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -359,9 +368,9 @@ Description: Samba Directory Services Database
Package: samba-vfs-modules
Architecture: any
-Breaks: samba-libs (<< 2:4.3.2+dfsg-1), samba (<< 2:4.3.2+dfsg-1)
-Replaces: samba-libs (<< 2:4.3.2+dfsg-1), samba (<< 2:4.3.2+dfsg-1)
-Depends: ${misc:Depends}, ${shlibs:Depends}, samba-libs (= ${binary:Version})
+Breaks: samba (<< 2:4.3.2+dfsg-1), samba-libs (<< 2:4.3.2+dfsg-1)
+Replaces: samba (<< 2:4.3.2+dfsg-1), samba-libs (<< 2:4.3.2+dfsg-1)
+Depends: samba-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Enhances: samba
Description: Samba Virtual FileSystem plugins
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -376,7 +385,7 @@ Section: libs
Architecture: any
Multi-Arch: same
Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}, samba-libs (= ${binary:Version})
+Depends: samba-libs (= ${binary:Version}), ${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
@@ -400,7 +409,11 @@ Description: development files for libsmbclient
Package: winbind
Pre-Depends: ${misc:Pre-Depends}
Architecture: any
-Depends: lsb-base (>= 3.0-6), samba-common (= ${source:Version}), samba-common-bin (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: lsb-base (>= 3.0-6),
+ samba-common (= ${source:Version}),
+ samba-common-bin (=${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Enhances: libkrb5-26-heimdal
Replaces: samba-doc (<< 2:4.0.5~), winbind4
Conflicts: samba-doc (<< 2:4.0.5~)
@@ -426,12 +439,12 @@ Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
Depends: libpam-runtime (>= 1.0.1-6),
libpam0g (>= 1.1.3-2~),
samba-common (= ${source:Version}),
+ samba-libs (= ${binary:Version}),
winbind (= ${binary:Version}),
${misc:Depends},
- ${shlibs:Depends}, samba-libs (= ${binary:Version})
+ ${shlibs:Depends}
Suggests: libnss-winbind
-Replaces: samba-doc (<< 2:4.0.5~),
- winbind4
+Replaces: samba-doc (<< 2:4.0.5~), 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,
@@ -448,9 +461,10 @@ Architecture: any
Multi-Arch: same
Pre-Depends: dpkg (>= 1.15.6~)
Depends: samba-common (= ${source:Version}),
+ samba-libs (= ${binary:Version}),
winbind (= ${binary:Version}),
${misc:Depends},
- ${shlibs:Depends}, samba-libs (= ${binary:Version})
+ ${shlibs:Depends}
Replaces: winbind4
Suggests: libpam-winbind
Description: Samba nameservice integration plugins
@@ -501,11 +515,12 @@ Multi-Arch: foreign
Depends: iproute2 [linux-any],
lsb-base (>= 3.0-6),
psmisc,
+ samba-libs (= ${binary:Version}),
sudo,
tdb-tools,
time,
${misc:Depends},
- ${shlibs:Depends}, samba-libs (= ${binary:Version})
+ ${shlibs:Depends}
Recommends: ethtool [linux-any]
Suggests: logrotate, lsof
Description: clustered database to store temporary data
diff --git a/debian/ctdb.install b/debian/ctdb.install
index c46a916..138a1ac 100644
--- a/debian/ctdb.install
+++ b/debian/ctdb.install
@@ -3,16 +3,16 @@ etc/sudoers.d
lib/systemd/system/ctdb.service
usr/bin/ctdb
usr/bin/ctdb_diagnostics
-usr/lib/*/ctdb/ctdb_event_helper
-usr/lib/*/ctdb/ctdb_lock_helper
-usr/lib/*/ctdb/ctdb_recovery_helper
usr/bin/ltdbtool
usr/bin/onnode
usr/bin/ping_pong
+usr/lib/*/ctdb/ctdb_event_helper
usr/lib/*/ctdb/ctdb_killtcp
+usr/lib/*/ctdb/ctdb_lock_helper
usr/lib/*/ctdb/ctdb_lvs
usr/lib/*/ctdb/ctdb_mutex_fcntl_helper
usr/lib/*/ctdb/ctdb_natgw
+usr/lib/*/ctdb/ctdb_recovery_helper
usr/lib/*/ctdb/smnotify
usr/sbin/ctdbd
usr/sbin/ctdbd_wrapper
diff --git a/debian/samba-dev.install b/debian/samba-dev.install
index 4341c21..2c9f7f6 100644
--- a/debian/samba-dev.install
+++ b/debian/samba-dev.install
@@ -89,11 +89,11 @@ usr/lib/*/libndr-standard.so
usr/lib/*/libndr.so
usr/lib/*/libnetapi.so
usr/lib/*/libsamba-credentials.so
+usr/lib/*/libsamba-errors.so
usr/lib/*/libsamba-hostconfig.so
usr/lib/*/libsamba-passdb.so
usr/lib/*/libsamba-policy.so
usr/lib/*/libsamba-util.so
-usr/lib/*/libsamba-errors.so
usr/lib/*/libsamdb.so
usr/lib/*/libsmbconf.so
usr/lib/*/libsmbldap.so
diff --git a/debian/samba-libs.install b/debian/samba-libs.install
index bab69ec..408c4c7 100644
--- a/debian/samba-libs.install
+++ b/debian/samba-libs.install
@@ -2,22 +2,19 @@ usr/lib/*/libdcerpc-binding.so.*
usr/lib/*/libdcerpc-samr.so.*
usr/lib/*/libdcerpc-server.so.*
usr/lib/*/libdcerpc.so.*
-usr/lib/*/samba/libgensec.so.0*
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/*/samba/libregistry.so.*
usr/lib/*/libsamba-credentials.so.0*
+usr/lib/*/libsamba-errors.so.*
usr/lib/*/libsamba-hostconfig.so.*
usr/lib/*/libsamba-passdb.so.0
usr/lib/*/libsamba-passdb.so.0.25.0
usr/lib/*/libsamba-policy.so.*
usr/lib/*/libsamba-util.so.*
-usr/lib/*/libsamba-errors.so.*
usr/lib/*/libsamdb.so.*
-usr/lib/*/samba/libsmbclient-raw.so.0*
usr/lib/*/libsmbconf.so.0
usr/lib/*/libsmbldap.so.0
usr/lib/*/libtevent-util.so.*
@@ -59,6 +56,7 @@ usr/lib/*/samba/libdsdb-module.so.*
usr/lib/*/samba/libevents.so.*
usr/lib/*/samba/libflag-mapping.so.0
usr/lib/*/samba/libgenrand.so.0
+usr/lib/*/samba/libgensec.so.0*
usr/lib/*/samba/libgpo.so.*
usr/lib/*/samba/libgse.so.*
usr/lib/*/samba/libgssapi-samba4.so.2
@@ -95,6 +93,7 @@ usr/lib/*/samba/libpopt-samba3.so.0
usr/lib/*/samba/libposix-eadb.so.0
usr/lib/*/samba/libprinting-migrate.so.0
usr/lib/*/samba/libprocess-model.so.0
+usr/lib/*/samba/libregistry.so.*
usr/lib/*/samba/libroken-samba4.so.19
usr/lib/*/samba/libroken-samba4.so.19.0.1
usr/lib/*/samba/libsamba-debug.so.0
@@ -111,6 +110,7 @@ usr/lib/*/samba/libserver-role.so.*
usr/lib/*/samba/libservice.so.*
usr/lib/*/samba/libshares.so.*
usr/lib/*/samba/libsmb-transport.so.0
+usr/lib/*/samba/libsmbclient-raw.so.0*
usr/lib/*/samba/libsmbd-base.so.0
usr/lib/*/samba/libsmbd-conn.so.0
usr/lib/*/samba/libsmbd-shim.so.0
diff --git a/debian/samba-testsuite.install b/debian/samba-testsuite.install
index 81c9916..bd1669a 100644
--- a/debian/samba-testsuite.install
+++ b/debian/samba-testsuite.install
@@ -3,8 +3,8 @@ usr/bin/locktest
usr/bin/masktest
usr/bin/ndrdump
usr/bin/smbtorture
-usr/lib/*/samba/libtorture.so.*
usr/lib/*/samba/libdlz-bind9-for-torture.so.0
+usr/lib/*/samba/libtorture.so.*
usr/share/man/man1/gentest.1
usr/share/man/man1/locktest.1
usr/share/man/man1/masktest.1
diff --git a/debian/samba.install b/debian/samba.install
index ca931f4..c712304 100644
--- a/debian/samba.install
+++ b/debian/samba.install
@@ -1,4 +1,7 @@
etc/ufw/applications.d/samba
+lib/systemd/system/nmbd.service
+lib/systemd/system/samba-ad-dc.service
+lib/systemd/system/smbd.service
usr/bin/eventlogadm
usr/bin/oLschema2ldif
usr/bin/pdbedit
@@ -14,9 +17,6 @@ usr/lib/*/samba/libkdc-samba4.so.2
usr/lib/*/samba/libkdc-samba4.so.2.0.0
usr/lib/*/samba/libpac.so.*
usr/lib/*/samba/service/*.so
-lib/systemd/system/nmbd.service
-lib/systemd/system/samba-ad-dc.service
-lib/systemd/system/smbd.service
usr/sbin/mksmbpasswd
usr/sbin/nmbd
usr/sbin/samba
diff --git a/debian/smbclient.install b/debian/smbclient.install
index 4ffb9cb..6a5a3cb 100644
--- a/debian/smbclient.install
+++ b/debian/smbclient.install
@@ -6,9 +6,9 @@ usr/bin/smbclient
usr/bin/smbcquotas
usr/bin/smbget
usr/bin/smbspool
-usr/lib/*/samba/smbspool_krb5_wrapper
usr/bin/smbtar
usr/bin/smbtree
+usr/lib/*/samba/smbspool_krb5_wrapper
usr/share/man/man1/findsmb.1
usr/share/man/man1/rpcclient.1
usr/share/man/man1/smbcacls.1
diff --git a/debian/winbind.install b/debian/winbind.install
index 2c81660..8474c8c 100644
--- a/debian/winbind.install
+++ b/debian/winbind.install
@@ -1,3 +1,4 @@
+lib/systemd/system/winbind.service
usr/bin/ntlm_auth
usr/bin/wbinfo
usr/lib/*/plugin/krb5/winbind_krb5_locator.so
@@ -7,7 +8,6 @@ usr/lib/*/samba/nss_info/hash.so
usr/lib/*/samba/nss_info/rfc2307.so
usr/lib/*/samba/nss_info/sfu.so
usr/lib/*/samba/nss_info/sfu20.so
-lib/systemd/system/winbind.service
usr/sbin/winbindd
usr/share/man/man1/ntlm_auth.1
usr/share/man/man1/wbinfo.1
--
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