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

Mon May 13 23:21:33 UTC 2013

Author: ebourg-guest
Date: 2013-05-13 23:21:33 +0000 (Mon, 13 May 2013)
New Revision: 16620

Removed:
   trunk/xmlunit/debian/patches/0003-Remove-image-from-title-as-a-workaround.patch
Modified:
   trunk/xmlunit/debian/changelog
   trunk/xmlunit/debian/control
   trunk/xmlunit/debian/copyright
   trunk/xmlunit/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch
   trunk/xmlunit/debian/patches/series
   trunk/xmlunit/debian/rules
Log:
New upstream release (1.4)
Refreshed the patches
Updated Standards-Version to 3.9.4 (no changes)
Removed Michael Koch from the Uploaders list (Closes: #654143)
debian/copyright: Updated to comply with the Copyright Format 1.0
debian/rules: Improved the clean target to allow rebuilds


Modified: trunk/xmlunit/debian/changelog
===================================================================

--- trunk/xmlunit/debian/changelog	2013-05-13 23:19:35 UTC (rev 16619)
+++ trunk/xmlunit/debian/changelog	2013-05-13 23:21:33 UTC (rev 16620)
@@ -1,3 +1,15 @@
+xmlunit (1.4-1) unstable; urgency=low
+
+  * Team upload.
+  * New upstream release
+  * Refreshed the patches
+  * Updated Standards-Version to 3.9.4 (no changes)
+  * Removed Michael Koch from the Uploaders list (Closes: #654143)
+  * debian/copyright: Updated to comply with the Copyright Format 1.0
+  * debian/rules: Improved the clean target to allow rebuilds
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 14 May 2013 01:13:55 +0200
+
 xmlunit (1.3-2) unstable; urgency=low
 
   * Team upload.

Modified: trunk/xmlunit/debian/control
===================================================================
--- trunk/xmlunit/debian/control	2013-05-13 23:19:35 UTC (rev 16619)
+++ trunk/xmlunit/debian/control	2013-05-13 23:21:33 UTC (rev 16620)
@@ -2,10 +2,10 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, ant-optional, maven-ant-helper, dblatex
 Build-Depends-Indep: maven-repo-helper, junit, libjaxp1.3-java, docbook-xsl, libxalan2-java (>= 2.7.1-3)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xmlunit
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xmlunit/
 Homepage: http://xmlunit.sourceforge.net/

Modified: trunk/xmlunit/debian/copyright
===================================================================
--- trunk/xmlunit/debian/copyright	2013-05-13 23:19:35 UTC (rev 16619)
+++ trunk/xmlunit/debian/copyright	2013-05-13 23:21:33 UTC (rev 16620)
@@ -1,7 +1,7 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: XMLUnit
-Maintainer: Jeff Martin, Tim Bacon
-Source: http://xmlunit.sourceforge.net/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: XMLUnit
+Upstream-Contact: Maintainer: Jeff Martin, Tim Bacon
+Source: http://xmlunit.sourceforge.net
 
 Files: *
 Copyright: 2001-2009, Jeff Martin, Tim Bacon
@@ -12,36 +12,35 @@
 License: GPL-3+
 
 License: BSD
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials provided
+       with the distribution.
+     * Neither the name of the xmlunit.sourceforge.net nor the names
+       of its contributors may be used to endorse or promote products
+       derived from this software without specific prior written
+       permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
 
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above
-        copyright notice, this list of conditions and the following
-        disclaimer in the documentation and/or other materials provided
-        with the distribution.
-      * Neither the name of the xmlunit.sourceforge.net nor the names
-        of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written
-        permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
-
-License: GPL-3
-  On Debian GNU/Linux system you can find the complete text of the
-  GNU General Public License version 3 license in 
-  '/usr/share/common-licenses/GPL-3'.
-
+License: GPL-3+
+ On Debian GNU/Linux system you can find the complete text of the
+ GNU General Public License version 3 license in 
+ '/usr/share/common-licenses/GPL-3'.

Modified: trunk/xmlunit/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch
===================================================================
--- trunk/xmlunit/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch	2013-05-13 23:19:35 UTC (rev 16619)
+++ trunk/xmlunit/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch	2013-05-13 23:21:33 UTC (rev 16620)
@@ -6,15 +6,12 @@
  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
--- 
+ <!--
+ Copyright (c) 2001-2013, Jeff Martin, Tim Bacon
+ All rights reserved.

Deleted: 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	2013-05-13 23:19:35 UTC (rev 16619)
+++ trunk/xmlunit/debian/patches/0003-Remove-image-from-title-as-a-workaround.patch	2013-05-13 23:21:33 UTC (rev 16620)
@@ -1,25 +0,0 @@
-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>
--- 

Modified: trunk/xmlunit/debian/patches/series
===================================================================
--- trunk/xmlunit/debian/patches/series	2013-05-13 23:19:35 UTC (rev 16619)
+++ trunk/xmlunit/debian/patches/series	2013-05-13 23:21:33 UTC (rev 16620)
@@ -1,3 +1,2 @@
 0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch
 0002-Ignore-test-failures.patch
-0003-Remove-image-from-title-as-a-workaround.patch

Modified: trunk/xmlunit/debian/rules
===================================================================
--- trunk/xmlunit/debian/rules	2013-05-13 23:19:35 UTC (rev 16619)
+++ trunk/xmlunit/debian/rules	2013-05-13 23:21:33 UTC (rev 16620)
@@ -21,6 +21,7 @@
 
 clean::
 	-rm -rf debian/tmp
+	mh_clean
 
 get-orig-pom:
 	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/xmlunit/xmlunit/$(VERSION)/xmlunit-$(VERSION).pom


