[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-2-12-g348fbce
The following commit has been merged in the master branch: commit 11959e14d172a89cb3aaec48c3d967e70ef4d307 Author: James Page Date: Tue Feb 28 16:50:53 2012 + Refreshed patches: * Refreshed patches: - Dropped disable-avalon-frawework.patch - no longer required. diff --git a/debian/changelog b/debian/changelog index d619990..4ee9ac1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ jenkins (1.424.3+dfsg-1) unstable; urgency=low * New upstream bugfix release. + * Refreshed patches: +- Dropped disable-avalon-frawework.patch - no longer required. * Enable use of jenkins-instance-identity and jenkins-ssh-cli-auth to support use of public/private keypairs when using the jenkins remote cli tool. @@ -11,7 +13,7 @@ jenkins (1.424.3+dfsg-1) unstable; urgency=low the jenkins user to help deal with transition from upstream packaging (Closes: #661203). - -- James Page Tue, 28 Feb 2012 16:46:30 + + -- James Page Tue, 28 Feb 2012 16:49:57 + jenkins (1.424.2+dfsg-2) unstable; urgency=low diff --git a/debian/patches/build/apt-stapler-processing.patch b/debian/patches/build/apt-stapler-processing.patch index d3e2e57..0d39fc7 100644 --- a/debian/patches/build/apt-stapler-processing.patch +++ b/debian/patches/build/apt-stapler-processing.patch @@ -10,9 +10,9 @@ Forwarded: not-needed Index: jenkins/core/pom.xml === jenkins.orig/core/pom.xml 2012-01-31 10:35:32.864316397 + -+++ jenkins/core/pom.xml 2012-01-31 10:35:34.520316354 + -@@ -573,6 +573,24 @@ +--- jenkins.orig/core/pom.xml 2012-02-28 16:48:34.425690522 + jenkins/core/pom.xml 2012-02-28 16:49:08.125793192 + +@@ -562,6 +562,24 @@ diff --git a/debian/patches/build/build.patch b/debian/patches/build/build.patch index 3d8a2ae..859258b 100644 --- a/debian/patches/build/build.patch +++ b/debian/patches/build/build.patch @@ -4,8 +4,8 @@ Forwarded: not-needed Index: jenkins/pom.xml === jenkins.orig/pom.xml 2012-01-31 10:35:19.684316727 + -+++ jenkins/pom.xml2012-01-31 10:35:32.864316397 + +--- jenkins.orig/pom.xml 2012-02-28 16:48:20.877649207 + jenkins/pom.xml2012-02-28 16:48:34.425690522 + @@ -48,10 +48,7 @@ @@ -19,9 +19,9 @@ Index: jenkins/pom.xml Index: jenkins/core/pom.xml === jenkins.orig/core/pom.xml 2012-01-31 10:35:19.708316726 + -+++ jenkins/core/pom.xml 2012-01-31 10:35:32.864316397 + -@@ -285,6 +285,16 @@ +--- jenkins.orig/core/pom.xml 2012-02-28 16:48:20.889649243 + jenkins/core/pom.xml 2012-02-28 16:48:34.425690522 + +@@ -274,6 +274,16 @@ commons-jelly commons-jelly-tags-fmt 1.0 diff --git a/debian/patches/build/disable-avalon-frawework.patch b/debian/patches/build/disable-avalon-frawework.patch deleted file mode 100644 index 9bec7f9..000 --- a/debian/patches/build/disable-avalon-frawework.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Removes un-needed dependency on Avalnon framework. Not - use in code so suspect its left over cruft. -Author: James Page -Forwarded: no - -Index: jenkins/core/src/main/java/hudson/util/DescribableList.java -=== jenkins.orig/core/src/main/java/hudson/util/DescribableList.java 2012-01-31 10:35:19.540316731 + -+++ jenkins/core/src/main/java/hudson/util/DescribableList.java 2012-01-31 10:35:33.408316383 + -@@ -39,7 +39,6 @@ - import hudson.model.ReconfigurableDescribable; - import hudson.model.Saveable; - import net.sf.json.JSONObject; --import org.apache.avalon.framework.configuration.Reconfigurable; - import org.kohsuke.stapler.StaplerRequest; - - import java.io.IOException; diff --git a/debian/patches/build/openjdk6.patch b/debian/patches/build/openjdk6.patch index 619e644..079024a 100644 --- a/debian/patches/build/openjdk6.patch +++ b/debian/patches/build/openjdk6.patch @@ -6,9 +6,9 @@ Forwarded: https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/716959 Index: jenkins/core/src/main/java/hudson/model/AbstractBuild.java === jenkins.orig/core/src/main/java/hudson/model/AbstractBuild.java 2012-01-31 10:35:19.484316732 + -+++ jenkins/core/src/main/java/hudson/model/AbstractBuild.java 2012-01-31 10:35:33.684316375 + -@@ -1186,4 +1186,13 @@ +--- jenkins.orig/core/src/main/java/hudson/model/AbstractBuild.java 2012-02-28 16:46:08.813245244 + jenkins/core/src/main/java/hudson/model/AbstractBuild.java 2012-02-28 16:48:39.265705276 + +@@ -1196,4 +1196,13 @@ } private static final Logger LOGGER = Logger.getLogger(AbstractBuild.class.ge
[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-2-12-g348fbce
The following commit has been merged in the master branch: commit 8e1fb20ff50225ab460f43e7b47d92dd3265821a Author: James Page Date: Tue Feb 28 16:52:20 2012 + Bumped Standards-Version: 3.9.3; no changes required. diff --git a/debian/changelog b/debian/changelog index 4ee9ac1..0b9c297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ jenkins (1.424.3+dfsg-1) unstable; urgency=low * New upstream bugfix release. * Refreshed patches: - Dropped disable-avalon-frawework.patch - no longer required. + * Bumped Standards-Version: 3.9.3; no changes required. * Enable use of jenkins-instance-identity and jenkins-ssh-cli-auth to support use of public/private keypairs when using the jenkins remote cli tool. @@ -13,7 +14,7 @@ jenkins (1.424.3+dfsg-1) unstable; urgency=low the jenkins user to help deal with transition from upstream packaging (Closes: #661203). - -- James Page Tue, 28 Feb 2012 16:49:57 + + -- James Page Tue, 28 Feb 2012 16:51:50 + jenkins (1.424.2+dfsg-2) unstable; urgency=low diff --git a/debian/control b/debian/control index a78ece0..3b0ab6e 100644 --- a/debian/control +++ b/debian/control @@ -93,7 +93,7 @@ Build-Depends-Indep: libtxw2-java, libxpp3-java, ttf-dejavu-core -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://jenkins-ci.org/ Vcs-Git: git://git.debian.org/git/pkg-java/jenkins.git Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins.git -- jenkins packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-2-12-g348fbce
The following commit has been merged in the master branch: commit 348fbce11a718e3dc51a50d6d356b9a74574fcae Author: James Page Date: Tue Feb 28 16:59:06 2012 + Fixed missing update for 1.424.3 diff --git a/debian/maven.rules b/debian/maven.rules index f95c999..7b353d9 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -22,7 +22,7 @@ commons-httpclient commons-httpclient jar s/3\..*/3.x/ * * junit junit jar s/3\..*/3.x/ * * junit junit jar s/4\..*/4.x/ * * # Map onto exact version during build process -org.jenkins-ci.main * * s/1\..*/1.424.2/ * * +org.jenkins-ci.main * * s/1\..*/1.424.3/ * * # Handle plugin package org.kohsuke access-modifier-annotation jar s/.*/1.0/ * * org.kohsuke access-modifier-checker * s/.*/1.0/ * * -- jenkins packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-2-12-g348fbce
The following commit has been merged in the master branch: commit 7a76bc7e604e7c3207577e758eb6067ad6c1e9c6 Author: James Page Date: Tue Feb 28 16:47:26 2012 + New upstream bugfix release. the jenkins user to help deal with transition from upstream packaging diff --git a/debian/changelog b/debian/changelog index c99f6a5..d619990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -jenkins (1.424.2+dfsg-3) unstable; urgency=low +jenkins (1.424.3+dfsg-1) unstable; urgency=low + * New upstream bugfix release. * Enable use of jenkins-instance-identity and jenkins-ssh-cli-auth to support use of public/private keypairs when using the jenkins remote cli tool. @@ -7,10 +8,10 @@ jenkins (1.424.2+dfsg-3) unstable; urgency=low * Updated plugin parent pom file to specifiy default source/target for maven-compiler-plugin as Java 1.5. * Ensure that jenkins group exists and that its the primary group for -the jenkins user to deal with transition from upstream packaging +the jenkins user to help deal with transition from upstream packaging (Closes: #661203). - -- James Page Sun, 26 Feb 2012 18:57:50 + + -- James Page Tue, 28 Feb 2012 16:46:30 + jenkins (1.424.2+dfsg-2) unstable; urgency=low -- jenkins packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-2-12-g348fbce
The following commit has been merged in the master branch: commit 5b49e31e5fcf49a5dfaffd47ddae9b86c13707ce Merge: 356c91c77ef0120896c803afa3276546084babb3 ebf5fe77f9a132a195535b16e0b50976de1560e9 Author: James Page Date: Tue Feb 28 16:46:08 2012 + Merge tag 'upstream/1.424.3+dfsg' Upstream version 1.424.3+dfsg -- jenkins packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-2-12-g348fbce
The following commit has been merged in the master branch:
commit 356c91c77ef0120896c803afa3276546084babb3
Author: James Page
Date: Sun Feb 26 19:14:43 2012 +
Ensure that jenkins group exists and that its the primary group for the
jenkins user to deal with transition from upstream packaging (Closes: #661203).
diff --git a/debian/changelog b/debian/changelog
index 09d2897..c99f6a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jenkins (1.424.2+dfsg-3) UNRELEASED; urgency=low
+jenkins (1.424.2+dfsg-3) unstable; urgency=low
* Enable use of jenkins-instance-identity and jenkins-ssh-cli-auth to
support use of public/private keypairs when using the jenkins remote
@@ -6,8 +6,11 @@ jenkins (1.424.2+dfsg-3) UNRELEASED; urgency=low
* Dropped jcaptcha-slf4j.patch; no longer required as library not used.
* Updated plugin parent pom file to specifiy default source/target for
maven-compiler-plugin as Java 1.5.
+ * Ensure that jenkins group exists and that its the primary group for
+the jenkins user to deal with transition from upstream packaging
+(Closes: #661203).
- -- James Page Mon, 13 Feb 2012 10:06:54 +
+ -- James Page Sun, 26 Feb 2012 18:57:50 +
jenkins (1.424.2+dfsg-2) unstable; urgency=low
diff --git a/debian/jenkins.postinst b/debian/jenkins.postinst
index bc84e20..fe0cd82 100644
--- a/debian/jenkins.postinst
+++ b/debian/jenkins.postinst
@@ -17,7 +17,7 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-# Setup environment variables for JOnAS
+# Setup environment variables for Jenkins
export JENKINS_ROOT="/usr/share/jenkins"
export JENKINS_HOME="/var/lib/jenkins"
@@ -29,6 +29,12 @@ case "$1" in
--group --disabled-password --quiet --shell /bin/bash \
jenkins
fi
+# Deal with migration from upstream packaging
+# which does not user jenkins group - uses nogroup
+if ! getent group jenkins > /dev/null 2>&1 ; then
+addgroup --system --quiet jenkins
+usermod -g jenkins jenkins > /dev/null 2>&1
+fi
# Fix directory permissions
chown -R jenkins:jenkins /var/log/jenkins || true
chown -R jenkins:jenkins ${JENKINS_HOME} || true
--
jenkins packaging
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
