[Pkg-samba-maint] [samba] 01/06: Add breaks.
Jelmer Vernooij
jelmer at alioth.debian.org
Sat Sep 14 14:25:55 UTC 2013
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 641664736d7615f5c3cc3b66e126a23032422ff1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Sep 8 17:24:43 2013 +0100
Add breaks.
---
debian/control | 99 ++++++++++++++++++++------
debian/libgensec-dev.install | 1 +
debian/samba-dev.install | 158 +++++++++++++++++++++---------------------
debian/samba-libs.install | 5 ++
4 files changed, 162 insertions(+), 101 deletions(-)
diff --git a/debian/control b/debian/control
index 7036504..738f3f3 100644
--- a/debian/control
+++ b/debian/control
@@ -59,41 +59,41 @@ Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
Depends: adduser,
libpam-modules,
libpam-runtime (>= 1.0.1-11),
- samba-libs (= ${binary:Version}),
libwbclient0 (= ${binary:Version}),
lsb-base (>= 3.2-13),
procps,
- samba-common (= ${source:Version}),
- update-inetd,
- ${misc:Depends},
- ${shlibs:Depends},
python,
python-dnspython,
python-samba,
+ samba-common (= ${source:Version}),
samba-common-bin (=${binary:Version}),
samba-dsdb-modules,
+ samba-libs (= ${binary:Version}),
tdb-tools,
+ update-inetd,
+ ${misc:Depends},
${python:Depends},
-Recommends: logrotate, attr
-Suggests: ctdb,
+ ${shlibs:Depends}
+Recommends: attr, logrotate
+Suggests: bind9 (>= 1:9.5.1),
+ bind9utils,
+ ctdb,
ldb-tools,
+ ntp,
smbldap-tools,
- winbind,
- bind9 (>= 1:9.5.1),
- bind9utils,
- ntp
+ winbind
Enhances: bind9, ntp
-Replaces: samba-common (<= 2.0.5a-2),
+Replaces: libsamdb0 (<< 4.0.0~alpha17~),
+ samba-ad-dc,
+ samba-common (<= 2.0.5a-2),
samba-doc (<< 2:4.0.5~),
- libsamdb0 (<< 4.0.0~alpha17~),
- samba4,
- samba-ad-dc
-Conflicts: samba-doc (<< 2:4.0.5~),
- samba4 (<< 4.0.0~alpha6-2),
- libldb1 (<< 1:1.1.15),
+ samba4
+Conflicts: libldb1 (<< 1:1.1.15),
samba (<< 2:3.3.0~rc2-5),
+ samba-ad-dc,
+ samba-doc (<< 2:4.0.5~),
samba-tools,
- samba-ad-dc
+ 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
@@ -115,7 +115,34 @@ Multi-Arch: same
Architecture: any
Section: libs
Depends: ${ldb:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Replaces: libsamdb0 (<< 4.0.4), libsmbd (<< 4.0.4), libsamba-policy0 (<< 4.0.4), libgensec0 (<< 4.0.4), libndr0 (<< 4.0.4), libndr-standard0 (<< 4.0.4), libdcerpc0 (<< 4.0.4), libdcerpc-server0 (<< 4.0.4), libregistry0 (<< 4.0.4), libsamba-hostconfig (<< 4.0.4), libtorture0 (<< 4.0.4), libsamba-util0 (<< 4.0.4), libsamba-credentials0 (<< 4.0.4), libsmbclient-raw0 (<< 4.0.4)
+Breaks: libdcerpc-server0 (<< 4.0.4),
+ libdcerpc0 (<< 4.0.4),
+ libgensec0 (<< 4.0.4),
+ libndr-standard0 (<< 4.0.4),
+ libndr0 (<< 4.0.4),
+ libregistry0 (<< 4.0.4),
+ libsamba-credentials0 (<< 4.0.4),
+ libsamba-hostconfig (<< 4.0.4),
+ libsamba-policy0 (<< 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)
+Replaces: libdcerpc-server0 (<< 4.0.4),
+ libdcerpc0 (<< 4.0.4),
+ libgensec0 (<< 4.0.4),
+ libndr-standard0 (<< 4.0.4),
+ libndr0 (<< 4.0.4),
+ libregistry0 (<< 4.0.4),
+ libsamba-credentials0 (<< 4.0.4),
+ libsamba-hostconfig (<< 4.0.4),
+ libsamba-policy0 (<< 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)
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,
@@ -262,7 +289,35 @@ Depends: libc6-dev,
libtdb-dev (>= 1.2.11),
${misc:Depends}
Section: devel
-Replaces: libsamdb (<< 4.0.4), libsmbd-dev (<< 4.0.4), libsamba-policy-dev (<< 4.0.4), libndr-dev (<< 4.0.4), libndr-standard-dev (<< 4.0.4), libgensec-dev (<< 4.0.4), libdcerpc-dev (<< 4.0.4), libdcerpc-server-dev (<< 4.0.4), libsamba-hostconfig-dev (<< 4.0.4), libregistry-dev (<< 4.0.4), libtorture-dev (<< 4.0.4), libsamba-util-dev (<< 4.0.4), libsmbclient-raw-dev (<< 4.0.4), libsamba-credentials-dev (<< 4.0.4), samba4-dev
+Replaces: 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),
+ libregistry-dev (<< 4.0.4),
+ libsamba-credentials-dev (<< 4.0.4),
+ libsamba-hostconfig-dev (<< 4.0.4),
+ libsamba-policy-dev (<< 4.0.4),
+ libsamba-util-dev (<< 4.0.4),
+ libsamdb (<< 4.0.4),
+ libsmbclient-raw-dev (<< 4.0.4),
+ libsmbd-dev (<< 4.0.4),
+ libtorture-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),
+ libregistry-dev (<< 4.0.4),
+ libsamba-credentials-dev (<< 4.0.4),
+ libsamba-hostconfig-dev (<< 4.0.4),
+ libsamba-policy-dev (<< 4.0.4),
+ libsamba-util-dev (<< 4.0.4),
+ libsamdb (<< 4.0.4),
+ libsmbclient-raw-dev (<< 4.0.4),
+ libsmbd-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,
@@ -292,9 +347,9 @@ Architecture: any
Section: python
Provides: ${python:Provides}
Depends: libnetapi0 (=${binary:Version}),
- samba-libs (=${binary:Version}),
python-ldb,
python-tdb,
+ samba-libs (=${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
diff --git a/debian/libgensec-dev.install b/debian/libgensec-dev.install
index e69de29..8b13789 100644
--- a/debian/libgensec-dev.install
+++ b/debian/libgensec-dev.install
@@ -0,0 +1 @@
+
diff --git a/debian/samba-dev.install b/debian/samba-dev.install
index 8c9e82a..6ff85bb 100644
--- a/debian/samba-dev.install
+++ b/debian/samba-dev.install
@@ -3,23 +3,44 @@ usr/include/samba-4.0/core/doserr.h
usr/include/samba-4.0/core/error.h
usr/include/samba-4.0/core/ntstatus.h
usr/include/samba-4.0/core/werror.h
+usr/include/samba-4.0/credentials.h
+usr/include/samba-4.0/dcerpc.h
+usr/include/samba-4.0/dcerpc_server.h
+usr/include/samba-4.0/dlinklist.h
usr/include/samba-4.0/domain_credentials.h
usr/include/samba-4.0/gen_ndr/atsvc.h
+usr/include/samba-4.0/gen_ndr/auth.h
+usr/include/samba-4.0/gen_ndr/dcerpc.h
+usr/include/samba-4.0/gen_ndr/drsblobs.h
+usr/include/samba-4.0/gen_ndr/drsuapi.h
usr/include/samba-4.0/gen_ndr/epmapper.h
+usr/include/samba-4.0/gen_ndr/krb5pac.h
usr/include/samba-4.0/gen_ndr/lsa.h
usr/include/samba-4.0/gen_ndr/mgmt.h
usr/include/samba-4.0/gen_ndr/misc.h
usr/include/samba-4.0/gen_ndr/nbt.h
usr/include/samba-4.0/gen_ndr/ndr_atsvc.h
+usr/include/samba-4.0/gen_ndr/ndr_atsvc_c.h
+usr/include/samba-4.0/gen_ndr/ndr_dcerpc.h
+usr/include/samba-4.0/gen_ndr/ndr_drsblobs.h
+usr/include/samba-4.0/gen_ndr/ndr_drsuapi.h
usr/include/samba-4.0/gen_ndr/ndr_epmapper.h
+usr/include/samba-4.0/gen_ndr/ndr_epmapper_c.h
+usr/include/samba-4.0/gen_ndr/ndr_krb5pac.h
usr/include/samba-4.0/gen_ndr/ndr_mgmt.h
+usr/include/samba-4.0/gen_ndr/ndr_mgmt_c.h
usr/include/samba-4.0/gen_ndr/ndr_misc.h
+usr/include/samba-4.0/gen_ndr/ndr_nbt.h
usr/include/samba-4.0/gen_ndr/ndr_samr.h
+usr/include/samba-4.0/gen_ndr/ndr_samr_c.h
usr/include/samba-4.0/gen_ndr/ndr_svcctl.h
+usr/include/samba-4.0/gen_ndr/ndr_svcctl_c.h
usr/include/samba-4.0/gen_ndr/netlogon.h
+usr/include/samba-4.0/gen_ndr/samr.h
usr/include/samba-4.0/gen_ndr/security.h
usr/include/samba-4.0/gen_ndr/server_id.h
usr/include/samba-4.0/gen_ndr/svcctl.h
+usr/include/samba-4.0/gensec.h
usr/include/samba-4.0/ldap-util.h
usr/include/samba-4.0/ldap_errors.h
usr/include/samba-4.0/ldap_message.h
@@ -27,118 +48,97 @@ 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.h
+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/param.h
usr/include/samba-4.0/passdb.h
+usr/include/samba-4.0/policy.h
+usr/include/samba-4.0/read_smb.h
+usr/include/samba-4.0/registry.h
usr/include/samba-4.0/roles.h
+usr/include/samba-4.0/rpc_common.h
usr/include/samba-4.0/samba/session.h
usr/include/samba-4.0/samba/version.h
+usr/include/samba-4.0/samba_util.h
+usr/include/samba-4.0/share.h
+usr/include/samba-4.0/smb2.h
+usr/include/samba-4.0/smb2_constants.h
+usr/include/samba-4.0/smb2_create_blob.h
+usr/include/samba-4.0/smb2_signing.h
+usr/include/samba-4.0/smb_cli.h
+usr/include/samba-4.0/smb_cliraw.h
+usr/include/samba-4.0/smb_common.h
+usr/include/samba-4.0/smb_composite.h
+usr/include/samba-4.0/smb_constants.h
usr/include/samba-4.0/smb_ldap.h
+usr/include/samba-4.0/smb_raw.h
+usr/include/samba-4.0/smb_raw_interfaces.h
+usr/include/samba-4.0/smb_raw_signing.h
+usr/include/samba-4.0/smb_raw_trans2.h
+usr/include/samba-4.0/smb_request.h
+usr/include/samba-4.0/smb_seal.h
+usr/include/samba-4.0/smb_signing.h
+usr/include/samba-4.0/smb_unix_ext.h
+usr/include/samba-4.0/smb_util.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/torture.h
usr/include/samba-4.0/tsocket.h
usr/include/samba-4.0/tsocket_internal.h
usr/include/samba-4.0/util/attr.h
+usr/include/samba-4.0/util/byteorder.h
+usr/include/samba-4.0/util/data_blob.h
+usr/include/samba-4.0/util/debug.h
+usr/include/samba-4.0/util/memory.h
+usr/include/samba-4.0/util/safe_string.h
+usr/include/samba-4.0/util/string_wrappers.h
+usr/include/samba-4.0/util/talloc_stack.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/tevent_werror.h
+usr/include/samba-4.0/util/time.h
+usr/include/samba-4.0/util/xfile.h
usr/include/samba-4.0/util_ldb.h
-usr/lib/*/libpdb.so
-usr/lib/*/libsmbldap.so
-usr/include/samba-4.0/dcerpc.h
-usr/include/samba-4.0/gen_ndr/dcerpc.h
-usr/include/samba-4.0/gen_ndr/ndr_atsvc_c.h
-usr/include/samba-4.0/gen_ndr/ndr_dcerpc.h
-usr/include/samba-4.0/gen_ndr/ndr_epmapper_c.h
-usr/include/samba-4.0/gen_ndr/ndr_mgmt_c.h
-usr/include/samba-4.0/gen_ndr/ndr_samr_c.h
-usr/include/samba-4.0/gen_ndr/ndr_svcctl_c.h
-usr/include/samba-4.0/gen_ndr/samr.h
-usr/include/samba-4.0/rpc_common.h
usr/lib/*/libdcerpc-atsvc.so
usr/lib/*/libdcerpc-binding.so
usr/lib/*/libdcerpc-samr.so
+usr/lib/*/libdcerpc-server.so
usr/lib/*/libdcerpc.so
+usr/lib/*/libgensec.so
+usr/lib/*/libndr-krb5pac.so
+usr/lib/*/libndr-nbt.so
+usr/lib/*/libndr-standard.so
+usr/lib/*/libndr.so
+usr/lib/*/libpdb.so
+usr/lib/*/libregistry.so
+usr/lib/*/libsamba-credentials.so
+usr/lib/*/libsamba-hostconfig.so
+usr/lib/*/libsamba-policy.so
+usr/lib/*/libsamba-util.so
+usr/lib/*/libsamdb.so
+usr/lib/*/libsmbclient-raw.so
+usr/lib/*/libsmbconf.so
+usr/lib/*/libsmbldap.so
+usr/lib/*/libtevent-util.so
+usr/lib/*/libtorture.so
usr/lib/*/pkgconfig/dcerpc.pc
usr/lib/*/pkgconfig/dcerpc_atsvc.pc
usr/lib/*/pkgconfig/dcerpc_samr.pc
-usr/include/samba-4.0/dcerpc_server.h
-usr/lib/*/libdcerpc-server.so
usr/lib/*/pkgconfig/dcerpc_server.pc
-usr/include/samba-4.0/gensec.h
-usr/lib/*/libgensec.so
usr/lib/*/pkgconfig/gensec.pc
-usr/include/samba-4.0/ndr.h
-usr/lib/*/libndr.so
usr/lib/*/pkgconfig/ndr.pc
-usr/include/samba-4.0/gen_ndr/auth.h
-usr/include/samba-4.0/gen_ndr/krb5pac.h
-usr/include/samba-4.0/gen_ndr/ndr_krb5pac.h
-usr/include/samba-4.0/gen_ndr/ndr_nbt.h
-usr/include/samba-4.0/ndr/ndr_nbt.h
-usr/lib/*/libndr-krb5pac.so
-usr/lib/*/libndr-nbt.so
-usr/lib/*/libndr-standard.so
usr/lib/*/pkgconfig/ndr_krb5pac.pc
usr/lib/*/pkgconfig/ndr_nbt.pc
usr/lib/*/pkgconfig/ndr_standard.pc
-usr/include/samba-4.0/registry.h
-usr/lib/*/libregistry.so
usr/lib/*/pkgconfig/registry.pc
-usr/include/samba-4.0/credentials.h
-usr/lib/*/libsamba-credentials.so
usr/lib/*/pkgconfig/samba-credentials.pc
-usr/include/samba-4.0/param.h
-usr/include/samba-4.0/share.h
-usr/lib/*/libsamba-hostconfig.so
usr/lib/*/pkgconfig/samba-hostconfig.pc
-usr/include/samba-4.0/policy.h
-usr/lib/*/libsamba-policy.so
usr/lib/*/pkgconfig/samba-policy.pc
-usr/include/samba-4.0/dlinklist.h
-usr/include/samba-4.0/samba_util.h
-usr/include/samba-4.0/util/byteorder.h
-usr/include/samba-4.0/util/data_blob.h
-usr/include/samba-4.0/util/debug.h
-usr/include/samba-4.0/util/memory.h
-usr/include/samba-4.0/util/safe_string.h
-usr/include/samba-4.0/util/string_wrappers.h
-usr/include/samba-4.0/util/talloc_stack.h
-usr/include/samba-4.0/util/tevent_werror.h
-usr/include/samba-4.0/util/time.h
-usr/include/samba-4.0/util/xfile.h
-usr/lib/*/libsamba-util.so
-usr/lib/*/libtevent-util.so
usr/lib/*/pkgconfig/samba-util.pc
-usr/lib/*/libsamdb.so
usr/lib/*/pkgconfig/samdb.pc
-usr/include/samba-4.0/gen_ndr/drsblobs.h
-usr/include/samba-4.0/gen_ndr/drsuapi.h
-usr/include/samba-4.0/gen_ndr/ndr_drsblobs.h
-usr/include/samba-4.0/gen_ndr/ndr_drsuapi.h
-usr/include/samba-4.0/ndr/ndr_drsblobs.h
-usr/include/samba-4.0/ndr/ndr_drsuapi.h
-usr/include/samba-4.0/read_smb.h
-usr/include/samba-4.0/smb2.h
-usr/include/samba-4.0/smb2_constants.h
-usr/include/samba-4.0/smb2_create_blob.h
-usr/include/samba-4.0/smb2_signing.h
-usr/include/samba-4.0/smb_cli.h
-usr/include/samba-4.0/smb_cliraw.h
-usr/include/samba-4.0/smb_common.h
-usr/include/samba-4.0/smb_composite.h
-usr/include/samba-4.0/smb_constants.h
-usr/include/samba-4.0/smb_raw.h
-usr/include/samba-4.0/smb_raw_interfaces.h
-usr/include/samba-4.0/smb_raw_signing.h
-usr/include/samba-4.0/smb_raw_trans2.h
-usr/include/samba-4.0/smb_request.h
-usr/include/samba-4.0/smb_seal.h
-usr/include/samba-4.0/smb_signing.h
-usr/include/samba-4.0/smb_unix_ext.h
-usr/include/samba-4.0/smb_util.h
-usr/lib/*/libsmbclient-raw.so
-usr/lib/*/libsmbconf.so
usr/lib/*/pkgconfig/smbclient-raw.pc
-usr/include/samba-4.0/torture.h
-usr/lib/*/libtorture.so
usr/lib/*/pkgconfig/torture.pc
diff --git a/debian/samba-libs.install b/debian/samba-libs.install
index f2de819..44de05a 100644
--- a/debian/samba-libs.install
+++ b/debian/samba-libs.install
@@ -21,9 +21,11 @@ usr/lib/*/libsmbldap.so.0
usr/lib/*/libtevent-util.so.*
usr/lib/*/libtorture.so.*
usr/lib/*/samba/auth/
+usr/lib/*/samba/auth/
usr/lib/*/samba/bind9/dlz_bind9.so
usr/lib/*/samba/bind9/dlz_bind9_9.so
usr/lib/*/samba/gensec/*.so
+usr/lib/*/samba/gensec/*.so
usr/lib/*/samba/hdb/hdb_samba4.so
usr/lib/*/samba/libCHARSET3.so.*
usr/lib/*/samba/libHDB_SAMBA4.so.*
@@ -83,6 +85,8 @@ usr/lib/*/samba/libsamba3-util.so.*
usr/lib/*/samba/libsamba_python.so.*
usr/lib/*/samba/libsamdb-common.so.*
usr/lib/*/samba/libsecrets3.so.*
+usr/lib/*/samba/libsecrets3.so.*
+usr/lib/*/samba/libserver-role.so.*
usr/lib/*/samba/libserver-role.so.*
usr/lib/*/samba/libservice.so.*
usr/lib/*/samba/libshares.so.*
@@ -93,6 +97,7 @@ usr/lib/*/samba/libsmbd_shim.so.*
usr/lib/*/samba/libsmbldaphelper.so.*
usr/lib/*/samba/libsmbpasswdparser.so.*
usr/lib/*/samba/libsmbregistry.so.*
+usr/lib/*/samba/libsmbregistry.so.*
usr/lib/*/samba/libtdb-wrap.so.*
usr/lib/*/samba/libtdb_compat.so.*
usr/lib/*/samba/libtrusts_util.so.*
--
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