diff -Nru jenkins-1.409.1/debian/changelog jenkins-1.409.1/debian/changelog --- jenkins-1.409.1/debian/changelog 2011-07-22 12:21:29.000000000 +0000 +++ jenkins-1.409.1/debian/changelog 2011-09-02 10:45:41.000000000 +0000 @@ -1,3 +1,22 @@ +jenkins (1.409.1-0ubuntu2~oneiric1~ppa1) oneiric; urgency=low + + * No-change backport to oneiric + + -- James Page Fri, 02 Sep 2011 11:45:41 +0100 + +jenkins (1.409.1-0ubuntu2) oneiric; urgency=low + + * Resolved issue with specific group being set in upstart + configuration (LP: #820938). + * Rebuild to pickup new versions of jenkins-xstream to enable ARM + compatibility (LP: #827463). + * Rebuild to pickup new versions of jcaptcha and jenkins-winstone to + resolve compatibiltiy issues with libservlet2.5-java (LP: #827651). + * Fix FTBFS due to missing fonts causing test failure in Jenkins core: + - debian/control: added ttf-dejavu-core to Build-Depends-Indep + + -- James Page Wed, 31 Aug 2011 16:21:33 +0100 + jenkins (1.409.1-0ubuntu1) oneiric; urgency=low * Initial release. diff -Nru jenkins-1.409.1/debian/control jenkins-1.409.1/debian/control --- jenkins-1.409.1/debian/control 2011-07-22 12:21:29.000000000 +0000 +++ jenkins-1.409.1/debian/control 2011-09-02 10:17:27.000000000 +0000 @@ -83,7 +83,8 @@ libstapler-java, libtrilead-putty-extension-java, libtxw2-java, - libxpp3-java + libxpp3-java, + ttf-dejavu-core Standards-Version: 3.9.2 Homepage: http://jenkins-ci.org/ diff -Nru jenkins-1.409.1/debian/jenkins-slave.upstart jenkins-1.409.1/debian/jenkins-slave.upstart --- jenkins-1.409.1/debian/jenkins-slave.upstart 2011-07-22 12:21:29.000000000 +0000 +++ jenkins-1.409.1/debian/jenkins-slave.upstart 2011-09-02 10:17:27.000000000 +0000 @@ -32,7 +32,7 @@ if [ ! -n "$JENKINS_HOSTNAME" ]; then JENKINS_HOSTNAME=$(hostname) fi - exec daemon --name=jenkins-slave --inherit --output=$JENKINS_LOG/jenkins-slave.log --user=$USER:$GROUP \ + exec daemon --name=jenkins-slave --inherit --output=$JENKINS_LOG/jenkins-slave.log --user=$USER \ -- $JAVA_HOME/bin/java $JAVA_OPTS -jar $JENKINS_RUN/slave.jar \ -jnlpUrl $JENKINS_URL/computer/$JENKINS_HOSTNAME/slave-agent.jnlp end script diff -Nru jenkins-1.409.1/debian/jenkins.upstart jenkins-1.409.1/debian/jenkins.upstart --- jenkins-1.409.1/debian/jenkins.upstart 2011-07-22 12:21:29.000000000 +0000 +++ jenkins-1.409.1/debian/jenkins.upstart 2011-09-02 10:17:27.000000000 +0000 @@ -26,6 +26,6 @@ script JENKINS_ARGS="--webroot=$JENKINS_RUN/war --httpPort=$HTTP_PORT --ajp13Port=$AJP_PORT" - exec daemon --name=jenkins --inherit --output=$JENKINS_LOG/jenkins.log --user=$USER:$GROUP \ + exec daemon --name=jenkins --inherit --output=$JENKINS_LOG/jenkins.log --user=$USER \ -- $JAVA_HOME/bin/java $JAVA_OPTS -jar $JENKINS_ROOT/jenkins.war $JENKINS_ARGS end script