[SCM] jenkins packaging branch, master, updated. debian/1.466.2+dfsg-1-13-gf2fe1f8

James Page james.page at ubuntu.com
Thu Jan 10 10:11:54 UTC 2013


The following commit has been merged in the master branch:
commit c81c4fc55dc0960abd7fc5fdb3c94123be723cfd
Author: James Page <james.page at ubuntu.com>
Date:   Wed Jan 9 17:53:34 2013 +0000

    Re-instate +dfsg

diff --git a/debian/changelog b/debian/changelog
index c31edfe..95e425d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jenkins (1.480.2-1~exp1) UNRELEASED; urgency=low
+jenkins (1.480.2+dfsg-1~exp1) UNRELEASED; urgency=low
 
   * New upstream release:
     - d/control: Added new BD on libjbcrypt-java.
diff --git a/debian/rules b/debian/rules
index 8871d74..a05436a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 # Parse upstream version without +dfsg for source download+
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)-.*,\1,p')
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
 DEB_MAVEN_BUILD_TARGET := install
 DEB_MAVEN_ARGS := -e -Dbuild.version="$(DEB_UPSTREAM_VERSION)"
 DEB_MAVEN_INSTALL_TO_USJ := false

-- 
jenkins packaging



More information about the pkg-java-commits mailing list