This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jenkins-xstream.
commit 4ce0b75305a1f3591e92dbf7b263c2311fabf023 Author: Emmanuel Bourg <[email protected]> Date: Fri Sep 5 22:50:23 2014 +0200 Replaced the patch disabling the Maven modules with ignore rules in debian/libjenkins-xstream-java.poms --- debian/changelog | 2 ++ debian/libjenkins-xstream-java.poms | 3 +++ debian/patches/0001-build.patch | 22 ---------------------- debian/patches/series | 1 - 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 720a4f4..d50ca35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ jenkins-xstream (1.4.4-jenkins-4-2) UNRELEASED; urgency=medium * Team upload. + * Replaced the patch disabling the hibernate, benchmark and distribution + modules with ignore rules in debian/libjenkins-xstream-java.poms * debian/control: - Standards-Version updated to 3.9.5 (no changes) - Use canonical URLs for the Vcs-* fields diff --git a/debian/libjenkins-xstream-java.poms b/debian/libjenkins-xstream-java.poms index 257bc3f..3ce47a9 100644 --- a/debian/libjenkins-xstream-java.poms +++ b/debian/libjenkins-xstream-java.poms @@ -27,3 +27,6 @@ # pom.xml --no-parent xstream/pom.xml --java-lib --usj-name=jenkins-xstream +xstream-hibernate/pom.xml --ignore +xstream-benchmark/pom.xml --ignore +xstream-distribution/pom.xml --ignore diff --git a/debian/patches/0001-build.patch b/debian/patches/0001-build.patch deleted file mode 100644 index 1b5f3ea..0000000 --- a/debian/patches/0001-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Debian Java Maintainers <[email protected]> -Date: Mon, 12 Aug 2013 13:18:58 +0100 -Subject: build - ---- - pom.xml | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/pom.xml b/pom.xml -index f096d70..3c79e28 100644 ---- 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/series b/debian/patches/series index f2f8dd0..0ffae16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -0001-build.patch 0002-sax.patch 0003-Drop-use-of-dependency-plugin-from-package-target.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
