diff -Nru upstart-app-launch-0.3+14.04.20140321/debian/changelog upstart-app-launch-0.3+14.04.20140411/debian/changelog --- upstart-app-launch-0.3+14.04.20140321/debian/changelog 2014-04-11 22:20:14.000000000 +0000 +++ upstart-app-launch-0.3+14.04.20140411/debian/changelog 2014-04-11 22:20:14.000000000 +0000 @@ -1,3 +1,10 @@ +upstart-app-launch (0.3+14.04.20140411-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Kill all jobs in process group on exit + + -- Ubuntu daily release Fri, 11 Apr 2014 22:14:55 +0000 + upstart-app-launch (0.3+14.04.20140321-0ubuntu1) trusty; urgency=low [ Colin Watson ] diff -Nru upstart-app-launch-0.3+14.04.20140321/upstart-jobs/application-click.conf.in upstart-app-launch-0.3+14.04.20140411/upstart-jobs/application-click.conf.in --- upstart-app-launch-0.3+14.04.20140321/upstart-jobs/application-click.conf.in 2014-03-21 17:55:39.000000000 +0000 +++ upstart-app-launch-0.3+14.04.20140411/upstart-jobs/application-click.conf.in 2014-04-11 22:14:45.000000000 +0000 @@ -12,6 +12,7 @@ env APP_DIR # For Surface Flinger env APP_DESKTOP_FILE +env APP_PROCESS_GROUP env UPSTART_APP_LAUNCH_ARCH="@upstart_app_launch_arch@" export UPSTART_APP_LAUNCH_ARCH @@ -29,5 +30,12 @@ # Remember, this is confined exec @pkglibexecdir@/exec-line-exec -post-start exec @pkglibexecdir@/zg-report-app open -post-stop exec @pkglibexecdir@/zg-report-app close +post-start script + initctl set-env APP_PROCESS_GROUP=`upstart-app-pid ${APP_ID}` + @pkglibexecdir@/zg-report-app open +end script + +post-stop script + pkill -KILL -g "${APP_PROCESS_GROUP}" || true + @pkglibexecdir@/zg-report-app close +end script