Merging debian version 2:4.20.1+dfsg-4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 12 insertions, 11 deletions

diff --git a/debian/control b/debian/control
index 028a0bc..1a7693d 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Build-Depends-Arch:
 # the same [arch list] is in rules (with-ceph) and ctdb.install
 	libcephfs-dev [amd64 arm64 mips64el ppc64el riscv64 s390x],
 	librados-dev  [amd64 arm64 mips64el ppc64el riscv64 s390x],
-	libcmocka-dev (>= 1.1.3),
+	libcmocka-dev,
 	libcups2-dev,
 	libdbus-1-dev,
 	libglusterfs-dev [amd64 arm64 ppc64el ppc64 riscv64 mips64el s390x ia64 sparc64],
@@ -51,7 +51,7 @@ Build-Depends-Arch:
 	libgpgme11-dev,
 	libicu-dev,
 	libjansson-dev,
-	libkeyutils-dev,
+	libkeyutils-dev [linux-any],
 	libkrb5-dev (>= 1.21.0~) <pkg.samba.mitkrb5>,
 	libldap2-dev,
 	liblmdb-dev,
@@ -62,11 +62,11 @@ Build-Depends-Arch:
 	libreadline-dev,
 	libtirpc-dev,
 	libsystemd-dev [linux-any],
-	libtasn1-6-dev (>= 3.8),
+	libtasn1-6-dev,
 	libtasn1-bin,
 	liburing-dev [linux-any],
 	xfslibs-dev [linux-any],
-	zlib1g-dev (>= 1:1.2.3),
+	zlib1g-dev,
 # python (+#904999):
 	python3-dev:any | python3-dev, libpython3-dev,
 	python3-dnspython,
@@ -201,15 +201,17 @@ Depends: samba (= ${binary:Version}),
 Recommends: libnss-winbind, libpam-winbind,
 # samba-ad-provision is needed for setup only
 	samba-ad-provision
-Suggests: bind9 (>= 1:9.5.1),
+Suggests: bind9,
 	  bind9utils,
 	  ldb-tools,
-	  ntp | chrony (>= 3.0-1),
+	  ntp | chrony,
 Enhances: bind9, ntp
 Breaks:   samba-ad-provision (<< ${source:Upstream-Version}),
 # files moved from samba & samba-common-bin in 4.20.1-2:
-	  samba (<< 2:4.20.1+dfsg-2~), samba-common-bin (<< 2:4.20.1+dfsg-2~),
-Replaces: samba (<< 2:4.20.1+dfsg-2~), samba-common-bin (<< 2:4.20.1+dfsg-2~),
+	  samba-common-bin (<< 2:4.20.1+dfsg-2~),
+Replaces: samba-common-bin (<< 2:4.20.1+dfsg-2~),
+# Breaks+Replaces upgraded to Conflicts for DEP17 + /usr-move
+Conflicts: samba (<< 2:4.20.1+dfsg-2~),
 Description: Samba control files to run AD Domain Controller
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with
@@ -288,7 +290,7 @@ Package: samba-dev
 Architecture: any
 Multi-Arch: same
 Depends: libc6-dev,
-         libldb-dev (>= 2:2),
+         libldb-dev,
          libpopt-dev,
          libtalloc-dev,
          libtdb-dev,
@@ -460,8 +462,7 @@ Section: admin
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libpam-runtime (>= 1.0.1-6),
-         libpam0g (>= 1.1.3-2~),
+Depends: libpam-runtime,
          winbind:any (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}