[xml-maven-plugin] 06/23: added ITP, fixed classpath

[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 ae24718e1becf79d71c409223d5fd3168525957b
Author: Eugene Zhukov <eugene at debian.org>
Date:   Tue Jul 23 07:22:31 2013 +0000

    added ITP, fixed classpath
---
 debian/changelog                     |  2 +-
 debian/libxml-maven-plugin-java.poms |  2 +-
 debian/maven.rules                   |  2 ++
 debian/patches/pom_fixes.patch       | 20 +++++++++++---------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20b36a1..19d7325 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 xml-maven-plugin (1.0-1) unstable; urgency=low
 
-  * Initial release
+  * Initial release (Closes: #717626)
 
  -- Eugene Zhukov <jevgeni.zh at gmail.com>  Thu, 02 May 2013 11:34:01 +0000
diff --git a/debian/libxml-maven-plugin-java.poms b/debian/libxml-maven-plugin-java.poms
index 5ad70f2..64b1188 100644
--- a/debian/libxml-maven-plugin-java.poms
+++ b/debian/libxml-maven-plugin-java.poms
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version
+pom.xml --no-parent --has-package-version --java-lib
diff --git a/debian/maven.rules b/debian/maven.rules
index 05d53af..130a4fa 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,6 @@
 
 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/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *
diff --git a/debian/patches/pom_fixes.patch b/debian/patches/pom_fixes.patch
index f9d18bc..47d4eb3 100644
--- a/debian/patches/pom_fixes.patch
+++ b/debian/patches/pom_fixes.patch
@@ -2,10 +2,10 @@ 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-05-20>
+Last-Update: 2013-07-22
 
---- xml-maven-plugin-1.0.orig/pom.xml
-+++ xml-maven-plugin-1.0/pom.xml
+--- a/pom.xml
++++ b/pom.xml
 @@ -145,15 +145,15 @@
        </exclusions>
      </dependency>
@@ -26,18 +26,20 @@ Last-Update: <2013-05-20>
        <scope>test</scope>
      </dependency>
      <dependency>
-@@ -167,8 +167,21 @@
+@@ -167,8 +167,23 @@
    <build>
      <plugins>
        <plugin>
 +	<groupId>org.apache.maven.plugins</groupId>
 +	<artifactId>maven-jar-plugin</artifactId>
 +	<configuration>
-+	<archive>
-+	<manifest>
-+	<addClasspath>true</addClasspath>
-+	</manifest>
-+	</archive>
++	  <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>

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