The following commit has been merged in the master branch: commit 16cc32fe5668ab0c88ab842cea25a941b413c5a6 Author: James Page <james.p...@canonical.com> Date: Fri Oct 21 22:53:31 2011 +0100
New upstream release * New upstream release - Dropped all patches - no longer required. * d/watch: Updated with new upstream tag naming convention. * d/orig-tar.sh: Fix-up orig.tar.gz creation. * d/maven.{ignoreRules,cleanIgnoreRules}: Ignore new dependencies, not required for Debian build. diff --git a/debian/changelog b/debian/changelog index b60dede..5487337 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +jenkins-json (2.1-rev7-1) unstable; urgency=low + + * New upstream release + - Dropped all patches - no longer required. + * d/watch: Updated with new upstream tag naming convention. + * d/orig-tar.sh: Fix-up orig.tar.gz creation. + * d/maven.{ignoreRules,cleanIgnoreRules}: Ignore new dependencies, not + required for Debian build. + + -- James Page <james.p...@ubuntu.com> Fri, 21 Oct 2011 22:47:46 +0100 + jenkins-json (2.1-rev6-1) unstable; urgency=low * Initial Debian release (Closes: #634634) diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules index 12b6679..ca16cbd 100644 --- a/debian/maven.cleanIgnoreRules +++ b/debian/maven.cleanIgnoreRules @@ -21,6 +21,7 @@ org.codehaus.mojo cobertura-maven-plugin * * * * org.codehaus.mojo findbugs-maven-plugin * * * * org.codehaus.mojo javancss-maven-plugin * * * * org.codehaus.mojo jdepend-maven-plugin * * * * +org.codehaus.mojo build-helper-maven-plugin * * * * org.codehaus.mojo.groovy groovy-maven-plugin * * * * org.jruby jruby * * * * org.jvnet.wagon-svn wagon-svn * * * * diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 12b6679..ca16cbd 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -21,6 +21,7 @@ org.codehaus.mojo cobertura-maven-plugin * * * * org.codehaus.mojo findbugs-maven-plugin * * * * org.codehaus.mojo javancss-maven-plugin * * * * org.codehaus.mojo jdepend-maven-plugin * * * * +org.codehaus.mojo build-helper-maven-plugin * * * * org.codehaus.mojo.groovy groovy-maven-plugin * * * * org.jruby jruby * * * * org.jvnet.wagon-svn wagon-svn * * * * diff --git a/debian/patches/build.patch b/debian/patches/build.patch deleted file mode 100644 index 834f410..0000000 --- a/debian/patches/build.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Target Java 1.5 language instead of 1.3 -Author: James Page <james.p...@canonical.com> -Forwarded: not-needed - -Index: hudson-json/pom.xml -=================================================================== ---- hudson-json.orig/pom.xml 2011-01-18 21:34:58.349999996 +0000 -+++ hudson-json/pom.xml 2011-01-18 21:35:12.219999996 +0000 -@@ -192,8 +192,8 @@ - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -- <source>1.3</source> -- <target>1.1</target> -+ <source>1.5</source> -+ <target>1.5</target> - </configuration> - </plugin> - <plugin> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 5879227..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -build.patch -- jenkins-json 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