I've just uploaded an NMU with Tollef's consent. debdiff is attached. -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru systemd-37/debian/changelog systemd-37/debian/changelog --- systemd-37/debian/changelog 2011-10-12 08:57:21.000000000 +0200 +++ systemd-37/debian/changelog 2012-03-03 18:09:53.000000000 +0100 @@ -1,3 +1,13 @@ +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 <bi...@debian.org> Sat, 03 Mar 2012 17:42:10 +0100 + systemd (37-1) unstable; urgency=low [ Tollef Fog Heen ] diff -Nru systemd-37/debian/patches/debian-changes systemd-37/debian/patches/debian-changes --- systemd-37/debian/patches/debian-changes 2011-10-12 10:06:42.000000000 +0200 +++ systemd-37/debian/patches/debian-changes 2012-03-03 18:13:19.000000000 +0100 @@ -5,33 +5,16 @@ information below has been extracted from the changelog. Adjust it or drop it. . - systemd (37-1) unstable; urgency=low + systemd (37-1.1) unstable; urgency=low . - [ Tollef Fog Heen ] - * New upstream version - * Change the type of the debian-fixup service to oneshot. - Closes: #642961 - * Add ConditionPathIsDirectory to lib-init-rw.automount and - lib-init-rw.mount so we only activate the unit if the directory - exists. Closes: #633059 - * If a sysv service exists in both rcS and rcN.d runlevels, drop the - rcN.d ones to avoid loops. Closes: #637037 - * Blacklist fuse init script, we do the same work already internally. - Closes: #643700 - * Update README.Debian slightly for /run rather than /lib/init/rw - . - [ Josh Triplett ] - * Do a one-time migration of the $TMPTIME setting from /etc/default/rcS to - /etc/tmpfiles.d/tmp.conf. If /etc/default/rcS has a TMPTIME setting of - "infinite" or equivalent, migrate it to an /etc/tmpfiles.d/tmp.conf that - overrides the default /usr/lib/tmpfiles.d/tmp.conf and avoids clearing - /tmp. Closes: #643698 -Author: Tollef Fog Heen <tfh...@debian.org> -Bug-Debian: http://bugs.debian.org/633059 -Bug-Debian: http://bugs.debian.org/637037 -Bug-Debian: http://bugs.debian.org/642961 -Bug-Debian: http://bugs.debian.org/643698 -Bug-Debian: http://bugs.debian.org/643700 + * 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 +Author: Michael Biebl <bi...@debian.org> +Bug-Debian: http://bugs.debian.org/657979 +Bug-Debian: http://bugs.debian.org/661842 --- The information above should follow the Patch Tagging Guidelines, please @@ -442,3 +425,10 @@ if (s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels)) { /* If there a runlevels configured for this service +--- systemd-37.orig/units/systemd-initctl.socket ++++ systemd-37/units/systemd-initctl.socket +@@ -15,3 +15,4 @@ Before=sockets.target + [Socket] + ListenFIFO=/dev/initctl + SocketMode=0600 ++ExecStartPost=/bin/ln -sf /dev/initctl /run/initctl diff -Nru systemd-37/debian/rules systemd-37/debian/rules --- systemd-37/debian/rules 2011-10-12 08:57:21.000000000 +0200 +++ systemd-37/debian/rules 2012-03-03 18:09:53.000000000 +0100 @@ -38,4 +38,4 @@ dh_autoreconf debian/rules -- autoreconf %: - dh $@ --parallel --with autoreconf + dh $@ --with autoreconf diff -Nru systemd-37/debian/systemd.postinst systemd-37/debian/systemd.postinst --- systemd-37/debian/systemd.postinst 2011-10-12 08:57:21.000000000 +0200 +++ systemd-37/debian/systemd.postinst 2012-03-03 18:10:59.000000000 +0100 @@ -33,6 +33,12 @@ esac 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 systemd-machine-id-setup
signature.asc
Description: OpenPGP digital signature
