Update remaining policykit-1 (test) dependencies and prefer polkitd

Keep the policykit-1 dependency as alternative for easier backports.

Closes: #1025591

diff --git a/debian/control b/debian/control
index 10fb41447f4d61f7309c3c68dd91d066743c8573..faf73536c6ea8fedf2a28cb8e2090cbc97d953e3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -510,7 +510,7 @@ Depends: ${shlibs:Depends},
          default-dbus-system-bus | dbus-system-bus
 Recommends: libnss-myhostname,
             libnss-resolve,
-Suggests: policykit-1,
+Suggests: polkitd | policykit-1,
 Provides: resolvconf
 Conflicts: resolvconf
 Replaces: resolvconf,

diff --git a/debian/tests/control b/debian/tests/control
index 02f2c03c9bb1f17322ae36d285d494912ebfe9ed..e7c99be98222bbda2e40cd171c7263169709025f 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -44,7 +44,7 @@ Depends: systemd,
   pkg-config,
   cryptsetup-bin,
   systemd-sysv,
-  policykit-1,
+  polkitd | policykit-1,
   dnsmasq-base
 Restrictions: needs-root, isolation-container, breaks-testbed
 
@@ -59,7 +59,7 @@ Depends: systemd,
   pkg-config,
   cryptsetup-bin,
   systemd-sysv,
-  policykit-1,
+  polkitd | policykit-1,
   dnsmasq-base,
   build-essential,
   libsystemd-dev,