[SCM] jenkins packaging branch, master, updated. debian/1.424.3+dfsg-1-1-g8b2ad63

[James Page]

The following commit has been merged in the master branch:
commit 8b2ad633de09ab232f7d761fcdd662bfaa8cd3a7
Author: James Page <james.page at ubuntu.com>
Date:   Mon Mar 12 11:43:21 2012 +0000

    Switch upstart configuration to use start-stop-daemon to allow desktop systems to shutdown.

diff --git a/debian/changelog b/debian/changelog
index 0b9c297..c280d45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jenkins (1.424.3+dfsg-2) UNRELEASED; urgency=low
+
+  * Switch upstart configuration to use start-stop-daemon to allow
+    desktop systems to shutdown.
+
+ -- James Page <james.page at ubuntu.com>  Mon, 12 Mar 2012 11:42:43 +0000
+
 jenkins (1.424.3+dfsg-1) unstable; urgency=low
 
   * New upstream bugfix release.
diff --git a/debian/jenkins.upstart.in b/debian/jenkins.upstart.in
index 01ec80d..b55f37a 100644
--- a/debian/jenkins.upstart.in
+++ b/debian/jenkins.upstart.in
@@ -16,6 +16,7 @@ end script
 
 script
     [ -r /etc/default/jenkins ] && . /etc/default/jenkins
-    exec su -l $JENKINS_USER --shell=/bin/bash -c \
-        "JENKINS_HOME=$JENKINS_HOME $JAVA $JAVA_ARGS -jar $JENKINS_WAR $JENKINS_ARGS --logfile=$JENKINS_LOG"
+    export JENKINS_HOME
+    exec start-stop-daemon --start -c $JENKINS_USER --exec $JAVA --name jenkins \
+        -- $JAVA_ARGS -jar $JENKINS_WAR $JENKINS_ARGS --logfile=$JENKINS_LOG
 end script

-- 
jenkins packaging