diff -Nru procps-3.3.9/debian/changelog procps-3.3.9/debian/changelog --- procps-3.3.9/debian/changelog 2014-05-28 10:41:49.000000000 +0100 +++ procps-3.3.9/debian/changelog 2014-06-04 11:20:07.000000000 +0100 @@ -1,3 +1,12 @@ +procps (1:3.3.9-1ubuntu5) utopic; urgency=medium + + * Move procps upstart job to procps-instance, and make procps job to not + be a task, such that startpar knows that procps has already run. + (LP: #1326338) + * Build with a fixed debhelper. (unlike previous ubuntu4 upload). + + -- Dimitri John Ledkov Thu, 29 May 2014 09:46:15 +0200 + procps (1:3.3.9-1ubuntu3) utopic; urgency=high * No change rebuild against new dh_installinit, to call update-rc.d at diff -Nru procps-3.3.9/debian/preinst procps-3.3.9/debian/preinst --- procps-3.3.9/debian/preinst 2012-05-20 07:08:37.000000000 +0100 +++ procps-3.3.9/debian/preinst 2014-06-04 10:25:04.000000000 +0100 @@ -52,6 +52,11 @@ ;; upgrade) prep_mv_conffile procps "/etc/init.d/procps.sh" + if dpkg --compare-versions "$2" lt "1:3.3.9-1ubuntu5~"; then + if [ ! -e /etc/init/procps-instance.conf ] && [ -e /etc/init/procps.conf ]; then + cp /etc/init/procps.conf /etc/init/procps-instance.conf || true + fi + fi ;; abort-upgrade) ;; diff -Nru procps-3.3.9/debian/procps.procps-instance.upstart procps-3.3.9/debian/procps.procps-instance.upstart --- procps-3.3.9/debian/procps.procps-instance.upstart 1970-01-01 01:00:00.000000000 +0100 +++ procps-3.3.9/debian/procps.procps-instance.upstart 2014-01-06 14:35:01.000000000 +0000 @@ -0,0 +1,16 @@ +# procps - set sysctls from /etc/sysctl.conf +# +# This task sets kernel sysctl variables from /etc/sysctl.conf and +# /etc/sysctl.d + +description "set sysctls from /etc/sysctl.conf" + +instance $UPSTART_EVENTS +env UPSTART_EVENTS= + +start on virtual-filesystems or static-network-up + +task +script + cat /etc/sysctl.d/*.conf /etc/sysctl.conf | sysctl -e -p - +end script diff -Nru procps-3.3.9/debian/rules procps-3.3.9/debian/rules --- procps-3.3.9/debian/rules 2014-01-06 14:35:01.000000000 +0000 +++ procps-3.3.9/debian/rules 2014-06-04 11:04:57.000000000 +0100 @@ -112,6 +112,7 @@ override_dh_installinit: ifeq ($(DEB_HOST_ARCH_OS), linux) dh_installinit --update-rcd-params='start 17 S .' + dh_installinit --name procps-instance --no-start endif override_dh_makeshlibs: diff -Nru procps-3.3.9/debian/upstart procps-3.3.9/debian/upstart --- procps-3.3.9/debian/upstart 2014-01-06 14:35:01.000000000 +0000 +++ procps-3.3.9/debian/upstart 2014-05-29 08:41:04.000000000 +0100 @@ -1,16 +1,5 @@ # procps - set sysctls from /etc/sysctl.conf # -# This task sets kernel sysctl variables from /etc/sysctl.conf and -# /etc/sysctl.d +# signal startpar that procps has run -description "set sysctls from /etc/sysctl.conf" - -instance $UPSTART_EVENTS -env UPSTART_EVENTS= - -start on virtual-filesystems or static-network-up - -task -script - cat /etc/sysctl.d/*.conf /etc/sysctl.conf | sysctl -e -p - -end script +start on procps-instance