[xml-maven-plugin] 14/23: New upstream release 1.0.1

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository xml-maven-plugin.

commit d19d411530248d5dca25914709384cdfd08ef31a
Author: Eugene Zhukov <eugene at debian.org>
Date:   Mon Feb 1 09:17:04 2016 +0000

    New upstream release 1.0.1
---
 debian/changelog                  |  8 ++++++++
 debian/control                    |  2 +-
 debian/copyright                  |  2 +-
 debian/maven.rules                |  2 +-
 debian/patches/test_exclude.patch | 24 +++++++++++-------------
 debian/rules                      |  2 +-
 debian/watch                      |  1 -
 7 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6122f5..c4b2ea0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xml-maven-plugin (1.0.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * d/copyright: fixed obsolete URL
+  * Refreshed test_exclude.patch
+
+ -- Eugene Zhukov <eugene at debian.org>  Mon, 01 Feb 2016 07:52:56 +0000
+
 xml-maven-plugin (1.0-3) unstable; urgency=medium
 
   * Bump Standards-Version to 3.9.6 (no changes)
diff --git a/debian/control b/debian/control
index 4aee64e..96d47fb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xml-maven-plugin
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Eugene Zhukov <jevgeni.zh at gmail.com>
+Uploaders: Eugene Zhukov <eugene at debian.org>
 Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
 Build-Depends-Indep: libmaven-invoker-plugin-java, libjaxp1.3-java, libmaven2-core-java, libplexus-io-java,
  libplexus-resources-java, libplexus-utils-java, libxerces2-java, libxml-commons-resolver1.1-java (>= 1.2),
diff --git a/debian/copyright b/debian/copyright
index 238baf3..e24737d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Maven XML Plugin
-Source: http://mojo.codehaus.org/xml-maven-plugin/
+Source: https://github.com/mojohaus/xml-maven-plugin/
 
 Files: *
 Copyright: 2006-2013, The Apache Software Foundation
diff --git a/debian/maven.rules b/debian/maven.rules
index 9a2a9fc..8bda9e9 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,6 +1,6 @@
 
-org.codehaus.plexus plexus-resources jar s/1\..*/1.x/ * *
 s/net.sf.saxon/net.sourceforge.saxon s/saxon/saxon jar s/8.7/9.1.0.8 * *
+org.codehaus.plexus plexus-resources jar s/1\..*/1.x/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
diff --git a/debian/patches/test_exclude.patch b/debian/patches/test_exclude.patch
index 7da047d..44ea76c 100644
--- a/debian/patches/test_exclude.patch
+++ b/debian/patches/test_exclude.patch
@@ -1,25 +1,23 @@
 Description: one test excluded
-   * one test case excluded, fails because of Saxon newer version
-Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: 2013-05-03
+   * it fails because Saxon library is newer
 
---- xml-maven-plugin-1.0.orig/src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java
-+++ xml-maven-plugin-1.0/src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java
-@@ -187,7 +187,7 @@ public class TransformMojoTest
+--- a/src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java
++++ b/src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java
+@@ -190,7 +190,7 @@ public class TransformMojoTest
  
      /**
       * Builds the it7 test project.
 -     */
-+     *
-     public void testIt8() throws Exception
++     
+     public void testIt8()
+         throws Exception
      {
-         if ( !java1_6_Aware() )
-@@ -203,7 +203,7 @@ public class TransformMojoTest
-         assertEquals("http://www.saxonica.com/", eval( doc1, "/root/vendor-url" ) );
-         assertEquals("2.0", eval( doc1, "/root/version" ) );
+@@ -207,7 +207,7 @@ public class TransformMojoTest
+         assertEquals( "http://www.saxonica.com/", eval( doc1, "/root/vendor-url" ) );
+         assertEquals( "2.0", eval( doc1, "/root/version" ) );
      }
 -
-+*/
++    */
      /**
       * Builds the it10 test project.
       */
diff --git a/debian/rules b/debian/rules
index 932dbf6..c6c03b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,4 +8,4 @@ override_dh_clean:
 	rm -rf src/test/it*/target
 
 get-orig-source:
-	uscan --download-current-version --force-download --rename --repack
+	uscan --download-current-version
diff --git a/debian/watch b/debian/watch
index 0bef145..f1dd6d5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts=dversionmangle=s/(\d)[\+\.](?:dfsg|debian|ds)\.?\d*$/$1/ \
 https://github.com/mojohaus/xml-maven-plugin/tags \
 .*/archive/xml-maven-plugin-(\d\S*)\.tar\.gz debian jh_repack

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xml-maven-plugin.git