diff -u upstart-1.13.2/debian/changelog upstart-1.13.2/debian/changelog --- upstart-1.13.2/debian/changelog +++ upstart-1.13.2/debian/changelog @@ -1,3 +1,10 @@ +upstart (1.13.2-0ubuntu17) xenial; urgency=medium + + * Put back /lib/init/apparmor-profile-load shim, as some upstart jobs still + use that instead of /lib/apparmor/profile-load. (LP: #1432683) + + -- Martin Pitt Mon, 26 Oct 2015 08:59:04 +0100 + upstart (1.13.2-0ubuntu16) wily; urgency=medium * Move from libjson0-dev to libjson-c-dev. (LP: #1384886) diff -u upstart-1.13.2/debian/control upstart-1.13.2/debian/control --- upstart-1.13.2/debian/control +++ upstart-1.13.2/debian/control @@ -15,12 +15,12 @@ Package: upstart Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, init-system-helpers (>= 1.22ubuntu6), initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), debianutils (>= 4) +Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), debianutils (>= 4) Suggests: python3, graphviz, bash-completion, upstart-monitor -Replaces: upstart-job, sysvinit, startup-tasks, system-services, upstart-bin (<< 1.13.2-0ubuntu10~) +Replaces: upstart-job, sysvinit, startup-tasks, system-services, upstart-bin (<< 1.13.2-0ubuntu10~), init-system-helpers (<< 1.24ubuntu1) Conflicts: upstart-job, sysvinit, startup-tasks, system-services, lxcguest Provides: upstart-job, upstart-compat-sysv, startup-tasks, system-services -Breaks: libc6 (<< 2.12.1-0ubuntu12), friendly-recovery (<< 0.2.13), initramfs-tools (<< 0.103ubuntu8), upstart-bin (<< 1.13.2-0ubuntu10~) +Breaks: libc6 (<< 2.12.1-0ubuntu12), friendly-recovery (<< 0.2.13), initramfs-tools (<< 0.103ubuntu8), upstart-bin (<< 1.13.2-0ubuntu10~), init-system-helpers (<< 1.24ubuntu1) Multi-Arch: foreign Description: event-based init daemon - essential binaries upstart is a replacement for the /sbin/init daemon which handles diff -u upstart-1.13.2/debian/rules upstart-1.13.2/debian/rules --- upstart-1.13.2/debian/rules +++ upstart-1.13.2/debian/rules @@ -39,6 +39,7 @@ override_dh_fixperms: dh_fixperms chmod 755 debian/upstart/lib/init/upstart-job + chmod 755 debian/upstart/lib/init/apparmor-profile-load chmod 755 debian/upstart/usr/lib/upstart/migrate-inittab.pl override_dh_auto_install: diff -u upstart-1.13.2/debian/upstart.install upstart-1.13.2/debian/upstart.install --- upstart-1.13.2/debian/upstart.install +++ upstart-1.13.2/debian/upstart.install @@ -1,5 +1,6 @@ bin/init-checkconf usr/bin/ bin/initctl2dot usr/bin/ +debian/apparmor-profile-load lib/init/ debian/conf/*.conf etc/init/ debian/migrate-inittab.pl usr/lib/upstart/ debian/upstart-job lib/init/ only in patch2: unchanged: --- upstart-1.13.2.orig/debian/apparmor-profile-load +++ upstart-1.13.2/debian/apparmor-profile-load @@ -0,0 +1,3 @@ +#!/bin/sh + +[ -x /lib/apparmor/profile-load ] && exec /lib/apparmor/profile-load "$@"