[pkg-java] r14743 - in trunk/xmlunit/debian: . patches

Torsten Werner twerner at alioth.debian.org
Wed Sep 7 11:34:21 UTC 2011 

Author: twerner
Date: 2011-09-07 11:34:20 +0000 (Wed, 07 Sep 2011)
New Revision: 14743

Added:
   trunk/xmlunit/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch
   trunk/xmlunit/debian/patches/0002-Ignore-test-failures.patch
   trunk/xmlunit/debian/patches/0003-Remove-image-from-title-as-a-workaround.patch
Removed:
   trunk/xmlunit/debian/patches/build.patch
   trunk/xmlunit/debian/patches/docbook.patch
Modified:
   trunk/xmlunit/debian/changelog
   trunk/xmlunit/debian/patches/series
Log:
UNRELEASED
* Add a patch to workaround bug #634563 in dblatex.

Modified: trunk/xmlunit/debian/changelog
===================================================================
--- trunk/xmlunit/debian/changelog	2011-09-07 03:13:27 UTC (rev 14742)
+++ trunk/xmlunit/debian/changelog	2011-09-07 11:34:20 UTC (rev 14743)
@@ -1,13 +1,14 @@
 xmlunit (1.3-2) unstable; urgency=low
 
-  UNRELEASED, FTBFS due to bug #634563 in dblatex
+  UNRELEASED
   * Team upload.
   * Add Vcs-* headers.
   * Change Depends: default-jdk-doc.
   * Update Standards-Version: 3.9.1.
   * Switch to source format 3.0.
+  * Add a patch to workaround bug #634563 in dblatex.
 
- -- Torsten Werner <twerner at debian.org>  Wed, 31 Aug 2011 22:09:16 +0200
+ -- Torsten Werner <twerner at debian.org>  Wed, 07 Sep 2011 13:31:32 +0200
 
 xmlunit (1.3-1) unstable; urgency=low
 

Copied: trunk/xmlunit/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch (from rev 14742, trunk/xmlunit/debian/patches/docbook.patch)
===================================================================
--- trunk/xmlunit/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch	                        (rev 0)
+++ trunk/xmlunit/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch	2011-09-07 11:34:20 UTC (rev 14743)
@@ -0,0 +1,20 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Wed, 7 Sep 2011 13:23:05 +0200
+Subject: Fix DOCTYPE in XMLUnit-Java.xml.
+
+---
+ src/user-guide/XMLUnit-Java.xml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/user-guide/XMLUnit-Java.xml b/src/user-guide/XMLUnit-Java.xml
+index e93b0d3..2d0f8e3 100644
+--- a/src/user-guide/XMLUnit-Java.xml
++++ b/src/user-guide/XMLUnit-Java.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1b1//EN" "http://docbook.org/xml/simple/1.1b1/sdocbook.dtd">
++<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1b1//EN" "/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd">
+ 
+ <article>
+   <title>XMLUnit Java User's Guide
+-- 

Copied: trunk/xmlunit/debian/patches/0002-Ignore-test-failures.patch (from rev 14742, trunk/xmlunit/debian/patches/build.patch)
===================================================================
--- trunk/xmlunit/debian/patches/0002-Ignore-test-failures.patch	                        (rev 0)
+++ trunk/xmlunit/debian/patches/0002-Ignore-test-failures.patch	2011-09-07 11:34:20 UTC (rev 14743)
@@ -0,0 +1,21 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Wed, 7 Sep 2011 13:23:05 +0200
+Subject: Ignore test failures.
+
+---
+ build.xml |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index d33b9b7..c0a15a5 100644
+--- a/build.xml
++++ b/build.xml
+@@ -164,7 +164,6 @@ POSSIBILITY OF SUCH DAMAGE.
+       <report format="frames" todir="${test.report.dir}/html"/>
+     </junitreport>
+ 
+-    <fail if="tests.failed">Some tests failed</fail>
+   </target>
+ 
+   <target name="docs"
+-- 

Added: trunk/xmlunit/debian/patches/0003-Remove-image-from-title-as-a-workaround.patch
===================================================================
--- trunk/xmlunit/debian/patches/0003-Remove-image-from-title-as-a-workaround.patch	                        (rev 0)
+++ trunk/xmlunit/debian/patches/0003-Remove-image-from-title-as-a-workaround.patch	2011-09-07 11:34:20 UTC (rev 14743)
@@ -0,0 +1,25 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Wed, 7 Sep 2011 13:26:46 +0200
+Subject: Remove image from title as a workaround.
+
+Otherwise dblatex fails due to bug #634563.
+---
+ src/user-guide/XMLUnit-Java.xml |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/src/user-guide/XMLUnit-Java.xml b/src/user-guide/XMLUnit-Java.xml
+index 2d0f8e3..200c393 100644
+--- a/src/user-guide/XMLUnit-Java.xml
++++ b/src/user-guide/XMLUnit-Java.xml
+@@ -3,10 +3,6 @@
+ 
+ <article>
+   <title>XMLUnit Java User's Guide
+-    <inlinemediaobject><imageobject>
+-        <imagedata fileref="xmlunit.png" width="331" depth="100"
+-          valign="middle" format="PNG"/>
+-      </imageobject></inlinemediaobject>
+   </title>
+   <articleinfo>
+     <authorgroup>
+-- 

Deleted: trunk/xmlunit/debian/patches/build.patch
===================================================================
--- trunk/xmlunit/debian/patches/build.patch	2011-09-07 03:13:27 UTC (rev 14742)
+++ trunk/xmlunit/debian/patches/build.patch	2011-09-07 11:34:20 UTC (rev 14743)
@@ -1,10 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -164,7 +164,6 @@
-       <report format="frames" todir="${test.report.dir}/html"/>
-     </junitreport>
- 
--    <fail if="tests.failed">Some tests failed</fail>
-   </target>
- 
-   <target name="docs"

Deleted: trunk/xmlunit/debian/patches/docbook.patch
===================================================================
--- trunk/xmlunit/debian/patches/docbook.patch	2011-09-07 03:13:27 UTC (rev 14742)
+++ trunk/xmlunit/debian/patches/docbook.patch	2011-09-07 11:34:20 UTC (rev 14743)
@@ -1,9 +0,0 @@
---- a/src/user-guide/XMLUnit-Java.xml
-+++ b/src/user-guide/XMLUnit-Java.xml
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1b1//EN" "http://docbook.org/xml/simple/1.1b1/sdocbook.dtd">
-+<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1b1//EN" "/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd">
- 
- <article>
-   <title>XMLUnit Java User's Guide

Modified: trunk/xmlunit/debian/patches/series
===================================================================
--- trunk/xmlunit/debian/patches/series	2011-09-07 03:13:27 UTC (rev 14742)
+++ trunk/xmlunit/debian/patches/series	2011-09-07 11:34:20 UTC (rev 14743)
@@ -1,2 +1,3 @@
-docbook.patch
-build.patch
+0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch
+0002-Ignore-test-failures.patch
+0003-Remove-image-from-title-as-a-workaround.patch

More information about the pkg-java-commits mailing list