[xml-maven-plugin] 10/23: dropped one patch, minor improvements

[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 7e2c69bece4cb36250bca49ac88839c8e7b2ef9f
Author: Eugene Zhukov <eugene at debian.org>
Date:   Mon Aug 19 20:22:49 2013 +0000

    dropped one patch, minor improvements
---
 debian/control                    |  8 +++---
 debian/copyright                  |  4 +--
 debian/maven.rules                |  1 +
 debian/patches/pom_fixes.patch    | 52 ---------------------------------------
 debian/patches/series             |  1 -
 debian/patches/test_exclude.patch | 12 ++++-----
 6 files changed, 13 insertions(+), 65 deletions(-)

diff --git a/debian/control b/debian/control
index c4b6383..cc737a7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eugene Zhukov <jevgeni.zh at gmail.com>
-Build-Depends: debhelper (>= 8), cdbs, 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),  
- libmaven-plugin-testing-java, libsaxonb-java (>= 8.7), libxalan2-java, libmaven-plugin-tools-java
+Build-Depends: debhelper (>= 7), cdbs, 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),
+ libmaven-plugin-testing-java, libsaxonb-java (>= 9.1.0.8), libxalan2-java, libmaven-plugin-tools-java
 Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xml-maven-plugin
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xml-maven-plugin
diff --git a/debian/copyright b/debian/copyright
index 883daab..238baf3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Copyright: 2013, Eugene Zhukov <jevgeni.zh at gmail.com>
 License: Apache-2.0
 
 License: Apache-2.0
-  On Debian GNU/Linux system you can find the complete text of the
-  Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
 
 
diff --git a/debian/maven.rules b/debian/maven.rules
index 130a4fa..9a2a9fc 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +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 * *
 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/pom_fixes.patch b/debian/patches/pom_fixes.patch
deleted file mode 100644
index 47d4eb3..0000000
--- a/debian/patches/pom_fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: fixed deps
- * fixed dependencies according to debian local maven repo
- * maven-jar-plugin added for Class-Path in metainf
-Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: 2013-07-22
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -145,15 +145,15 @@
-       </exclusions>
-     </dependency>
-     <dependency>
--      <groupId>org.apache.maven.shared</groupId>
-+      <groupId>org.apache.maven.plugin-testing</groupId>
-       <artifactId>maven-plugin-testing-harness</artifactId>
--      <version>1.1</version>
-+      <version>1.2</version>
-       <scope>test</scope>
-     </dependency>
-     <dependency>
--      <groupId>net.sf.saxon</groupId>
-+      <groupId>net.sourceforge.saxon</groupId>
-       <artifactId>saxon</artifactId>
--      <version>8.7</version>
-+      <version>9.1.0.8</version>
-       <scope>test</scope>
-     </dependency>
-     <dependency>
-@@ -167,8 +167,23 @@
-   <build>
-     <plugins>
-       <plugin>
-+	<groupId>org.apache.maven.plugins</groupId>
-+	<artifactId>maven-jar-plugin</artifactId>
-+	<configuration>
-+	  <archive>
-+	    <manifest>
-+             <addClasspath>true</addClasspath>
-+             <classpathLayoutType>custom</classpathLayoutType>
-+             <customClasspathLayout>/usr/share/java/$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
-+	    </manifest>
-+	  </archive>
-+	</configuration>
-+	<version>2.2</version>
-+      </plugin>
-+      <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-invoker-plugin</artifactId>
-+	<version>1.5</version>
-         <configuration>
-           <projectsDirectory>src/it</projectsDirectory>
-           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/debian/patches/series b/debian/patches/series
index 5d68968..b59451d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 test_exclude.patch
-pom_fixes.patch
diff --git a/debian/patches/test_exclude.patch b/debian/patches/test_exclude.patch
index 694fb4e..7da047d 100644
--- a/debian/patches/test_exclude.patch
+++ b/debian/patches/test_exclude.patch
@@ -1,20 +1,20 @@
 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>
+Last-Update: 2013-05-03
 
---- a/src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java
-+++ b/src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java
-@@ -187,7 +187,7 @@
+--- 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
  
      /**
       * Builds the it7 test project.
 -     */
-+
++     *
      public void testIt8() throws Exception
      {
          if ( !java1_6_Aware() )
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ public class TransformMojoTest
          assertEquals("http://www.saxonica.com/", eval( doc1, "/root/vendor-url" ) );
          assertEquals("2.0", eval( doc1, "/root/version" ) );
      }

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