The following commit has been merged in the master branch:
commit aed83b90072fbbdecab813a1356375f4bfad92dc
Author: James Page <james.p...@ubuntu.com>
Date:   Thu Apr 26 12:45:36 2012 +0100

    New upstream release.
    
    * New upstream release.
    * Bumped Standards-Version to 3.9.3:
      - d/copyright: Refreshed for released version of DEP-5.
    * d/libjenkins-commons-jexl-java.poms: Use --java-lib to ensure that
      jars are installed to /usr/share/java.
    * d/source/lintian-overrides: Dropped - no longer required.

diff --git a/debian/changelog b/debian/changelog
index fe3080b..f27d806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+jenkins-commons-jexl (1.1-jenkins-20111212-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped Standards-Version to 3.9.3:
+    - d/copyright: Refreshed for released version of DEP-5.
+  * d/libjenkins-commons-jexl-java.poms: Use --java-lib to ensure that
+    jars are installed to /usr/share/java.
+  * d/source/lintian-overrides: Dropped - no longer required.
+
+ -- James Page <james.p...@ubuntu.com>  Thu, 26 Apr 2012 12:42:03 +0100
+
 jenkins-commons-jexl (1.1-hudson-20090508-1) unstable; urgency=low
 
   * Initial Debian release (Closes: #634631)
diff --git a/debian/control b/debian/control
index 10e0e69..ba4688a 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends-Indep:
  libcommons-logging-java-doc,
  libjavacc-maven-plugin-java,
  libmaven-javadoc-plugin-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: https://github.com/jenkinsci/jexl/
 Vcs-Git: git://git.debian.org/git/pkg-java/jenkins-commons-jexl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins-commons-jexl.git
diff --git a/debian/copyright b/debian/copyright
index 41e4790..9770b0c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Hudson Commons JEXL
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: Jenkins Commons JEXL
 Source: https://github.com/jenkinsci/jexl/
 
 Files: *
diff --git a/debian/libjenkins-commons-jexl-java.poms 
b/debian/libjenkins-commons-jexl-java.poms
index 9ec5af5..e498ef4 100644
--- a/debian/libjenkins-commons-jexl-java.poms
+++ b/debian/libjenkins-commons-jexl-java.poms
@@ -23,4 +23,4 @@
 #   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To 
use with POM files that are created
 #     temporarily for certain artifacts such as Javadoc jars.
 #
-pom.xml --has-package-version
+pom.xml --has-package-version --java-lib
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 7ce1df6..d41ef96 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -1,3 +1,8 @@
+Description: Force target Java version to 1.5 otherwise the javacc
+ files generated won't compile
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: not-needed
+
 Index: hudson-jexl/pom.xml
 ===================================================================
 --- hudson-jexl.orig/pom.xml   2011-06-29 11:02:11.456308337 +0100
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index 272e78e..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# version contains hu(ds)on so this is a false positive
-jenkins-commons-jexl source: debian-watch-file-should-mangle-version line 3

-- 
jenkins-commons-jexl 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

Reply via email to