This is an automated email from the git hooks/post-receive script. jamespage pushed a commit to branch master in repository jenkins-xstream.
commit 44dd4abc96c2c085bcdb3520aafc219306edb00e Author: James Page <[email protected]> Date: Mon Aug 12 13:18:52 2013 +0100 New upstream release: * New upstream release: - d/p/*: Refreshed patches. --- .gitignore | 2 ++ debian/changelog | 3 ++- debian/patches/build.patch | 45 ++++++++++--------------------------- debian/patches/java7-compat.patch | 24 -------------------- debian/patches/series | 1 - 5 files changed, 16 insertions(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index eb5a316..0948ec0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ target +*.rej +.pc diff --git a/debian/changelog b/debian/changelog index 2ea2d1b..eef0b56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ jenkins-xstream (1.4.4-jenkins-3-1) UNRELEASED; urgency=low - * New upstream release. + * New upstream release: + - d/p/*: Refreshed patches. -- James Page <[email protected]> Mon, 12 Aug 2013 13:15:27 +0100 diff --git a/debian/patches/build.patch b/debian/patches/build.patch index 28f97c0..2b5c071 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -1,33 +1,12 @@ -Index: hudson-xstream/pom.xml -=================================================================== ---- hudson-xstream.orig/pom.xml 2011-06-13 15:19:29.126816618 +0100 -+++ hudson-xstream/pom.xml 2011-06-13 15:19:56.166816638 +0100 -@@ -32,9 +32,6 @@ - </activation> - <modules> - <module>xstream</module> -- <!--module>xstream-builder</module--> -- <module>xstream-benchmark</module> -- <module>xstream-distribution</module> - </modules> - </profile> - <profile> -@@ -44,9 +41,6 @@ - </activation> - <modules> - <module>xstream</module> -- <!--module>xstream-builder</module--> -- <module>xstream-benchmark</module> -- <module>xstream-distribution</module> - </modules> - </profile> - <profile> -@@ -56,8 +50,6 @@ - </activation> - <modules> - <module>xstream</module> -- <module>xstream-benchmark</module> -- <module>xstream-distribution</module> - </modules> - </profile> - </profiles> +--- a/pom.xml ++++ b/pom.xml +@@ -68,9 +68,6 @@ + + <modules> + <module>xstream</module> +- <module>xstream-hibernate</module> +- <module>xstream-benchmark</module> +- <module>xstream-distribution</module> + </modules> + + <licenses> diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch deleted file mode 100644 index 38a33a7..0000000 --- a/debian/patches/java7-compat.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Add a profile for compilation with Java 7 -Author: James Page <[email protected]> -Forwarded: no - -Index: jenkins-xstream/pom.xml -=================================================================== ---- jenkins-xstream.orig/pom.xml 2012-06-12 22:00:53.775305000 +0100 -+++ jenkins-xstream/pom.xml 2012-06-12 22:13:29.437152274 +0100 -@@ -26,6 +26,15 @@ - <!-- xstream-builder is currently JDK 5 only --> - <profiles> - <profile> -+ <id>jdk17</id> -+ <activation> -+ <jdk>1.7</jdk> -+ </activation> -+ <modules> -+ <module>xstream</module> -+ </modules> -+ </profile> -+ <profile> - <id>jdk16</id> - <activation> - <jdk>1.6</jdk> diff --git a/debian/patches/series b/debian/patches/series index 2298012..69d2f17 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ build.patch sax.patch -java7-compat.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-xstream.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
