This is an automated email from the git hooks/post-receive script. jamespage pushed a commit to branch master in repository jenkins-xstream.
commit 67c53b769711c74c1d1f1d1c2f53e6d489b07678 Author: James Page <[email protected]> Date: Mon Aug 12 13:19:24 2013 +0100 Switch to using git patch-queue for patches --- debian/patches/0001-build.patch | 22 ++++++++++++++++++++++ debian/patches/0002-sax.patch | 21 +++++++++++++++++++++ debian/patches/build.patch | 12 ------------ debian/patches/sax.patch | 18 ------------------ debian/patches/series | 4 ++-- 5 files changed, 45 insertions(+), 32 deletions(-) diff --git a/debian/patches/0001-build.patch b/debian/patches/0001-build.patch new file mode 100644 index 0000000..1b5f3ea --- /dev/null +++ b/debian/patches/0001-build.patch @@ -0,0 +1,22 @@ +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/0002-sax.patch b/debian/patches/0002-sax.patch new file mode 100644 index 0000000..b7a5db0 --- /dev/null +++ b/debian/patches/0002-sax.patch @@ -0,0 +1,21 @@ +From: Debian Java Maintainers <[email protected]> +Date: Mon, 12 Aug 2013 13:18:58 +0100 +Subject: sax + +--- + xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java b/xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java +index 0651dba..3834984 100644 +--- a/xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java ++++ b/xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java +@@ -11,7 +11,7 @@ + */ + package com.thoughtworks.xstream.io.xml; + +-import com.megginson.sax.DataWriter; ++import com.sun.xml.txw2.output.DataWriter; + import com.thoughtworks.acceptance.someobjects.X; + import com.thoughtworks.acceptance.someobjects.Y; + import com.thoughtworks.xstream.XStream; diff --git a/debian/patches/build.patch b/debian/patches/build.patch deleted file mode 100644 index 2b5c071..0000000 --- a/debian/patches/build.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/sax.patch b/debian/patches/sax.patch deleted file mode 100644 index f2d6527..0000000 --- a/debian/patches/sax.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Use DataWriter implementation from txw2 (packaged) project - instead of older inactive sax project (unpackaged). -Author: James Page <[email protected]> -Forwarded: not-needed - -Index: hudson-xstream/xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java -=================================================================== ---- hudson-xstream.orig/xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java 2011-01-06 17:11:19.970435001 +0000 -+++ hudson-xstream/xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java 2011-01-06 17:27:29.300435001 +0000 -@@ -11,7 +11,7 @@ - */ - package com.thoughtworks.xstream.io.xml; - --import com.megginson.sax.DataWriter; -+import com.sun.xml.txw2.output.DataWriter; - import com.thoughtworks.acceptance.someobjects.X; - import com.thoughtworks.acceptance.someobjects.Y; - import com.thoughtworks.xstream.XStream; diff --git a/debian/patches/series b/debian/patches/series index 69d2f17..a68a4e2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -build.patch -sax.patch +0001-build.patch +0002-sax.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
