Adding debian version 256.1-2.debian/256.1-2

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

3 files changed, 14 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index c372313..b2cc7d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+systemd (256.1-2) unstable; urgency=medium
+
+  * Bump breaks/replaces to conflicts for DEP17. Breaks/replaces are not
+    enough when moving files between packages and between locations as per
+    DEP17, so bump to Conflicts. (Closes: #1073922)
+  * autopkgtest: add dependency on libcryptsetup-dev in unit-tests suite
+
+ -- Luca Boccassi <bluca@debian.org>  Sun, 23 Jun 2024 13:33:33 +0100
+
 systemd (256.1-1) unstable; urgency=medium
 
   * Bump versioned breaks against dracut to 102-2 (Closes: #1073290)
diff --git a/debian/control b/debian/control
index 6a7736e..4bccb60 100644
--- a/debian/control
+++ b/debian/control
@@ -164,8 +164,7 @@ Depends: ${shlibs:Depends},
 Recommends: libnss-mymachines,
             ${dlopen:Recommends},
 Suggests: ${dlopen:Suggests},
-Breaks: systemd (<< 256-2~),
-Replaces: systemd (<< 256-2~),
+Conflicts: systemd (<< 256-2~),
 Description: systemd container/nspawn tools
  This package provides systemd's tools for nspawn and container/VM management:
   * systemd-nspawn
@@ -543,8 +542,7 @@ Recommends: efibootmgr,
             ${dlopen:Recommends},
 Suggests: systemd-ukify,
           ${dlopen:Suggests},
-Breaks: systemd (<< 256-2~), systemd-boot-efi (<< 256-2~),
-Replaces: systemd (<< 256-2~), systemd-boot-efi (<< 256-2~),
+Conflicts: systemd (<< 256-2~), systemd-boot-efi (<< 256-2~),
 Description: simple UEFI boot manager - tools and services
  systemd-boot (short: sd-boot) is a simple UEFI boot manager. It provides a
  textual menu to select the entry to boot and an editor for the kernel command
@@ -649,8 +647,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
 Recommends: ${dlopen:Recommends},
 Suggests: ${dlopen:Suggests},
-Breaks: systemd (<< 256-2~),
-Replaces: systemd (<< 256-2~),
+Conflicts: systemd (<< 256-2~),
 Description: Provides the systemd-repart utility
  systemd-repart is a configuration-driven system partitioning tool. It follows
  the Discoverable Partitions Specification and provides support for encryption
@@ -663,8 +660,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
 Recommends: ${dlopen:Recommends},
 Suggests: ${dlopen:Suggests},
-Breaks: systemd (<< 256-2~),
-Replaces: systemd (<< 256-2~),
+Conflicts: systemd (<< 256-2~),
 Description: Provides cryptsetup, integritysetup and veritysetup utilities
  Utilities and units that integrated cryptsetup/integritysetup/veritysetup
  support in systemd.
diff --git a/debian/tests/control b/debian/tests/control
index fb7db14..6c8f773 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -127,6 +127,7 @@ Depends: systemd-tests,
   libpwquality-dev,
   libarchive-dev,
   libgcrypt20-dev,
+  libcryptsetup-dev,
   tzdata-legacy | tzdata (<< 2024a-1),
 Restrictions: needs-root, isolation-container, breaks-testbed