Switch libpam-systemd dependencies to prefer systemd-shim over systemd-sysv

This implements the CTTE decision #746578. This is a no-op on systems which
already have systemd-sysv installed, but will prevent installing that on
upgrades.

Closes: #769747

diff --git a/debian/changelog b/debian/changelog
index cf3c3afb0fa28afd88a33304f98bd8e95384b859..457f7f5bd1f0786ed7116542e38ea4a24d6a03bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ systemd (215-6) UNRELEASED; urgency=medium
     under all init systems, to get consistent ID_PATH attributes. This is
     required so that tools like systemd-rfkill can be used with SysVinit or
     upstart scripts, too. (LP: #1387282)
+  * Switch libpam-systemd dependencies to prefer systemd-shim over
+    systemd-sysv, to implement the CTTE decision #746578. This is a no-op on
+    systems which already have systemd-sysv installed, but will prevent
+    installing that on upgrades. (Closes: #769747)
 
   [ Didier Roche ]
   * debian/ifup@.service: add a ConditionPath on /run/network, to avoid

diff --git a/debian/control b/debian/control
index 75986c11e36cb4cb9737842b67216413d601fa6a..cbd2d6a275dd2643d828a99cc09d240ffc122e80 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -112,7 +112,7 @@ Depends: ${shlibs:Depends},
          systemd (= ${binary:Version}),
          libpam-runtime (>= 1.0.1-6),
          dbus,
-         systemd-sysv | systemd-shim (>= 8-2)
+         systemd-shim (>= 8-2) | systemd-sysv
 Description: system and service manager - PAM module
  systemd is a replacement for sysvinit.  It is dependency-based and
  able to read the LSB init script headers in addition to parsing rcN.d