From: Michael Biebl <biebl@debian.org>
Date: Tue, 6 Mar 2012 17:00:49 +0000 (+0100)
Subject: Add changes from NMU
X-Git-Tag: 43-1~14
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=532b0d80bed38ed1aba33397dc288d3099fbaff7;p=systemd

Add changes from NMU
---

diff --git a/debian/changelog b/debian/changelog
index 6db487cf..d4011cc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,16 @@ systemd (43-1) experimental; urgency=low
 
  -- Tollef Fog Heen <tfheen@debian.org>  Tue, 07 Feb 2012 21:36:34 +0100
 
+systemd (37-1.1) unstable; urgency=low
+
+  * Non-maintainer upload with Tollef's consent.
+  * Remove --parallel to workaround a bug in automake 1.11.3 which doesn't
+    generate parallel-safe build rules. Closes: #661842
+  * Create a compat symlink /run/initctl → /dev/initctl to work with newer
+    versions of sysvinit. Closes: #657979
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 03 Mar 2012 17:42:10 +0100
+
 systemd (37-1) unstable; urgency=low
 
   [ Tollef Fog Heen ]
diff --git a/debian/rules b/debian/rules
index 0c60341f..f4101118 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,4 +39,4 @@ override_dh_autoreconf:
 	dh_autoreconf debian/rules -- autoreconf
 
 %:
-	dh $@ --parallel --with autoreconf
+	dh $@ --with autoreconf
diff --git a/debian/systemd.postinst b/debian/systemd.postinst
index bfff5f05..6319a93c 100644
--- a/debian/systemd.postinst
+++ b/debian/systemd.postinst
@@ -40,6 +40,13 @@ EOF
     fi
 fi
 
+if dpkg --compare-versions "$2" lt "37-1.1"; then
+    # Create /run/initctl → /dev/initctl compat symlink on upgrades
+    if [ -e /sys/fs/cgroup/systemd ]; then
+        systemctl restart systemd-initctl.socket || true
+    fi
+fi
+
 if dpkg --compare-versions "$2" lt "40-1"; then
     # /lib/init/rw has been replaced by /run, so try to remove it on upgrades
     # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643699