From e8c534373c6e551596ead9d792dafb02eeef0d9d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 25 Apr 2024 04:55:10 +0200
Subject: Merging debian version 255.5-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/tests/control | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

(limited to 'debian/tests')

diff --git a/debian/tests/control b/debian/tests/control
index 3b2390f..a68437f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,35 +1,38 @@
 Tests: timedated, hostnamed, localed-locale, localed-x11-keymap, logind
 Depends: systemd,
+  systemd-resolved,
   systemd-timesyncd,
   libpam-systemd,
   libnss-systemd,
   acl,
   locales,
   evemu-tools,
-Restrictions: needs-root, isolation-container, skippable
+Restrictions: needs-root, isolation-container, skippable, breaks-testbed
 
 Tests: unit-config
 Depends: systemd,
+  systemd-resolved,
   libpam-systemd,
   libnss-systemd,
   acl,
   locales,
   evemu-tools,
   python3,
-  pkg-config,
-Restrictions: needs-root, allow-stderr
+  pkgconf,
+Restrictions: needs-root, allow-stderr, breaks-testbed
 
 Tests: storage
 Depends: systemd,
+  systemd-resolved,
   libpam-systemd,
   libnss-systemd,
   acl,
   locales,
   evemu-tools,
   python3,
-  pkg-config,
+  pkgconf,
   cryptsetup-bin,
-Restrictions: needs-root, isolation-machine
+Restrictions: needs-root, isolation-machine, breaks-testbed
 
 Tests: networkd-test.py
 Tests-Directory: test
@@ -41,7 +44,7 @@ Depends: systemd,
   locales,
   evemu-tools,
   python3,
-  pkg-config,
+  pkgconf,
   cryptsetup-bin,
   systemd-sysv,
   polkitd,
@@ -51,13 +54,14 @@ Restrictions: needs-root, isolation-container, breaks-testbed
 
 Tests: build-login
 Depends: systemd,
+  systemd-resolved,
   libpam-systemd,
   libnss-systemd,
   acl,
   locales,
   evemu-tools,
   python3,
-  pkg-config,
+  pkgconf,
   cryptsetup-bin,
   systemd-sysv,
   polkitd,
@@ -70,6 +74,7 @@ Tests: boot-and-services
 Depends: systemd-sysv,
   systemd-container,
   systemd-coredump,
+  systemd-resolved,
   libpam-systemd,
   libdw-dev,
   libelf-dev,
@@ -81,14 +86,15 @@ Depends: systemd-sysv,
   busybox-static,
   rsyslog,
   apparmor,
-  pkg-config,
+  pkgconf,
   python3,
   python3-pefile,
-  dhcpcd-base,
+  dhcpcd-base | dhcpcd5,
 Restrictions: needs-root, isolation-container, breaks-testbed, allow-stderr
 
 Tests: unit-tests
 Depends: systemd-tests,
+  systemd-resolved,
   libpam-systemd,
   libnss-myhostname,
   libnss-mymachines,
@@ -103,7 +109,7 @@ Depends: systemd-tests,
   xz-utils,
   libcap2-bin,
   iproute2,
-  liblz4-tool,
+  lz4,
   acl,
   iputils-ping,
   dbus-user-session,
@@ -112,6 +118,9 @@ Depends: systemd-tests,
   libfido2-dev,
   libdw-dev,
   libqrencode-dev,
+  libpwquality-dev,
+  libarchive-dev,
+  libgcrypt20-dev,
   tzdata-legacy | tzdata (<< 2024a-1),
 Restrictions: needs-root, isolation-container, breaks-testbed
 
@@ -124,7 +133,7 @@ Depends: systemd-tests,
   systemd-oomd,
   systemd-homed,
   systemd-resolved,
-  systemd-boot-efi,
+  systemd-boot-efi [amd64 arm64 armhf i386 riscv64],
   libnss-myhostname,
   libnss-mymachines,
   libnss-resolve,
@@ -135,7 +144,7 @@ Depends: systemd-tests,
   xz-utils,
   libcap2-bin,
   iproute2,
-  liblz4-tool,
+  lz4,
   acl,
   dmeventd,
   kbd,
@@ -151,7 +160,7 @@ Depends: systemd-tests,
   qemu-system-s390x [s390x],
   seabios,
   less,
-  pkg-config,
+  pkgconf,
   gcc,
   libc6-dev | libc-dev,
   make,
@@ -174,8 +183,12 @@ Depends: systemd-tests,
   libtss2-dev,
   libfido2-dev,
   libqrencode-dev,
+  libpwquality-dev,
+  libarchive-dev,
   libp11-kit-dev,
   libssl-dev,
+  libgcrypt20-dev,
+  libkmod-dev,
   python3-pexpect,
   screen,
   swtpm,
@@ -211,6 +224,7 @@ Restrictions: needs-root, allow-stderr, isolation-machine
 
 Tests: boot-smoke
 Depends: systemd-sysv,
+  systemd-resolved,
   network-manager,
   gdm3 [!s390x],
   xserver-xorg-video-dummy,
@@ -218,7 +232,8 @@ Restrictions: needs-root, isolation-container, allow-stderr, breaks-testbed
 
 Tests: build-with-static-libsystemd
 Depends: systemd,
-  pkg-config,
+  systemd-resolved,
+  pkgconf,
   build-essential,
   libsystemd-dev,
   libcap-dev,
-- 
cgit v1.2.3