[pkg-java] r14848 - in trunk/maven-scm/debian: . patches

Torsten Werner twerner at alioth.debian.org
Sun Sep 11 21:38:47 UTC 2011


Author: twerner
Date: 2011-09-11 21:38:47 +0000 (Sun, 11 Sep 2011)
New Revision: 14848

Added:
   trunk/maven-scm/debian/README.source
   trunk/maven-scm/debian/libmaven-scm-java-doc.doc-base.api
   trunk/maven-scm/debian/libmaven-scm-java-doc.install
   trunk/maven-scm/debian/maven.cleanIgnoreRules
   trunk/maven-scm/debian/maven.ignoreRules
   trunk/maven-scm/debian/maven.properties
   trunk/maven-scm/debian/maven.publishedRules
   trunk/maven-scm/debian/patches/
   trunk/maven-scm/debian/patches/0001-do-not-build-vss-module.patch
   trunk/maven-scm/debian/patches/series
Removed:
   trunk/maven-scm/debian/build.properties
   trunk/maven-scm/debian/build.xml
   trunk/maven-scm/debian/libmaven-scm-java.java-doc.doc-base
   trunk/maven-scm/debian/maven-scm-manager-plexus-components.xml
   trunk/maven-scm/debian/maven-scm-provider-accurev-components.xml
   trunk/maven-scm/debian/maven-scm-provider-bazaar-components.xml
   trunk/maven-scm/debian/maven-scm-provider-clearcase-components.xml
   trunk/maven-scm/debian/maven-scm-provider-cvsexe-components.xml
   trunk/maven-scm/debian/maven-scm-provider-cvsjava-components.xml
   trunk/maven-scm/debian/maven-scm-provider-gitexe-components.xml
   trunk/maven-scm/debian/maven-scm-provider-hg-components.xml
   trunk/maven-scm/debian/maven-scm-provider-local-components.xml
   trunk/maven-scm/debian/maven-scm-provider-perforce-components.xml
   trunk/maven-scm/debian/maven-scm-provider-starteam-components.xml
   trunk/maven-scm/debian/maven-scm-provider-svnexe-components.xml
   trunk/maven-scm/debian/maven-scm-provider-synergy-components.xml
   trunk/maven-scm/debian/maven-scm-provider-tfs-components.xml
   trunk/maven-scm/debian/maven-scm-provider-vss-components.xml
Modified:
   trunk/maven-scm/debian/changelog
   trunk/maven-scm/debian/control
   trunk/maven-scm/debian/libmaven-scm-java.poms
   trunk/maven-scm/debian/maven.rules
   trunk/maven-scm/debian/rules
Log:
Use Maven to build the package.

Added: trunk/maven-scm/debian/README.source
===================================================================
--- trunk/maven-scm/debian/README.source	                        (rev 0)
+++ trunk/maven-scm/debian/README.source	2011-09-11 21:38:47 UTC (rev 14848)
@@ -0,0 +1,9 @@
+Information about maven-scm
+------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.

Deleted: trunk/maven-scm/debian/build.properties
===================================================================
--- trunk/maven-scm/debian/build.properties	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/build.properties	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,15 +0,0 @@
-classpath.compile=\
-           /usr/share/java/plexus-container-default-alpha.jar:\
-           /usr/share/java/plexus-utils.jar:\
-           /usr/share/java/regexp.jar:\
-           /usr/share/java/ganymed-ssh2.jar:\
-           /usr/share/java/cvsclient.jar:\
-           /usr/share/java/junit.jar:\
-           ${basedir}/maven-scm-api/build/maven-scm-api-${version}.jar:\
-           ${basedir}/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/build/maven-scm-provider-git-commons-${version}.jar:\
-           ${basedir}/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/build/maven-scm-provider-svn-commons-${version}.jar:\
-           ${basedir}/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/build/maven-scm-provider-cvs-commons-${version}.jar
-
-javadoc.dir=build/api
-maven.test.skip=test
-

Deleted: trunk/maven-scm/debian/build.xml
===================================================================
--- trunk/maven-scm/debian/build.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/build.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,160 +0,0 @@
-<?xml version="1.0"?>
- 
-<project name="pkg-java" default="package" basedir="..">
- 
-    <property file="debian/build.properties"/>
-    <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
-    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
-    <macrodef name="cleanmodule">
-	    <attribute name="dir"/>
-	    <sequential>
-		  <ant target="clean" antfile="${maven.build}" dir="@{dir}">
-            <property name="debian.dir" location="debian" />
-            <property name="project.dir" value="@{dir}" />
-          </ant> 
-	    </sequential>
-    </macrodef>
-
-    <macrodef name="packagemodule">
-	    <attribute name="dir"/>
-	    <sequential>
-		<ant target="package" antfile="${maven.build}" dir="@{dir}">
-          <property name="debian.dir" location="debian" />
-          <property name="project.dir" value="@{dir}" />
-		</ant>
-	    </sequential>
-    </macrodef>
-
-    <target name="clean">
-        <delete dir="build"/>
-        <cleanmodule dir="maven-scm-api"/>
-        <cleanmodule dir="maven-scm-managers/maven-scm-manager-plexus"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-provider-bazaar"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-provider-hg"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-provider-vss"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-provider-tfs"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-provider-synergy"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-provider-local"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-provider-accurev"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-provider-starteam"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-provider-perforce"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-provider-clearcase"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe"/>
-        <cleanmodule dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava"/>
-        <cleanmodule dir="maven-scm-test"/>
-        <cleanmodule dir="maven-scm-client"/>
-    </target>
-
-    <target name="generate-sources">
-        <taskdef name="modello" classname="ModelloTask" classpath="/usr/share/java/maven-ant-helper.jar:/usr/share/java/modello-core.jar:/usr/share/java/modello-plugin-xml.jar:/usr/share/java/modello-plugin-xpp3.jar"/>
-
-        <modello model="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/mdo/git-settings.mdo" plugin="java"
-		 output="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/mdo/git-settings.mdo" plugin="xpp3-reader"
-		 output="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/mdo/git-settings.mdo" plugin="xsd"
-		 output="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/build/generated-sources" version="1.0.0"/>
-
-        <modello model="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo" plugin="java"
-		 output="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/build/generated-sources" version="1.1.0"/>
-        <modello model="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo" plugin="xpp3-reader"
-		 output="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/build/generated-sources" version="1.1.0"/>
-        <modello model="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo" plugin="xsd"
-		 output="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/build/generated-sources" version="1.1.0"/>
-
-        <modello model="maven-scm-providers/maven-scm-provider-vss/src/main/mdo/vss-settings.mdo" plugin="java"
-		 output="maven-scm-providers/maven-scm-provider-vss/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-provider-vss/src/main/mdo/vss-settings.mdo" plugin="xpp3-reader"
-		 output="maven-scm-providers/maven-scm-provider-vss/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-provider-vss/src/main/mdo/vss-settings.mdo" plugin="xsd"
-		 output="maven-scm-providers/maven-scm-provider-vss/build/generated-sources" version="1.0.0"/>
-
-        <modello model="maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo" plugin="java"
-		 output="maven-scm-providers/maven-scm-provider-local/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo" plugin="xpp3-reader"
-		 output="maven-scm-providers/maven-scm-provider-local/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo" plugin="xpp3-writer"
-		 output="maven-scm-providers/maven-scm-provider-local/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-provider-local/src/main/mdo/maven-scm-local-metadata.mdo" plugin="xsd"
-		 output="maven-scm-providers/maven-scm-provider-local/build/generated-sources" version="1.0.0"/>
-
-        <modello model="maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo" plugin="java"
-		 output="maven-scm-providers/maven-scm-provider-starteam/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo" plugin="xpp3-reader"
-		 output="maven-scm-providers/maven-scm-provider-starteam/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-provider-starteam/src/main/mdo/starteam-settings.mdo" plugin="xsd"
-		 output="maven-scm-providers/maven-scm-provider-starteam/build/generated-sources" version="1.0.0"/>
-
-        <modello model="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo" plugin="java"
-		 output="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo" plugin="xpp3-reader"
-		 output="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/build/generated-sources" version="1.0.0"/>
-        <modello model="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/mdo/cvs-settings.mdo" plugin="xsd"
-		 output="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/build/generated-sources" version="1.0.0"/>
-
-        <modello model="maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/clearcase-settings.mdo" plugin="java"
-		 output="maven-scm-providers/maven-scm-provider-clearcase/build/generated-sources" version="1.1.0"/>
-        <modello model="maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/clearcase-settings.mdo" plugin="xpp3-reader"
-		 output="maven-scm-providers/maven-scm-provider-clearcase/build/generated-sources" version="1.1.0"/>
-        <modello model="maven-scm-providers/maven-scm-provider-clearcase/src/main/mdo/clearcase-settings.mdo" plugin="xsd"
-		 output="maven-scm-providers/maven-scm-provider-clearcase/build/generated-sources" version="1.1.0"/>
-
-    </target>
-
-    <target name="package" depends="generate-sources">
-        <packagemodule dir="maven-scm-api"/>
-        <packagemodule dir="maven-scm-managers/maven-scm-manager-plexus"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-provider-bazaar"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-provider-hg"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-provider-vss"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-provider-tfs"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-provider-synergy"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-provider-local"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-provider-accurev"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-provider-starteam"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-provider-perforce"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-provider-clearcase"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe"/>
-        <packagemodule dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava"/>
-        <packagemodule dir="maven-scm-test"/>
-        <packagemodule dir="maven-scm-client"/>
-    </target>
-
-    <target name="javadoc">
-        <javadoc destdir="${javadoc.dir}">
-            <packageset dir="maven-scm-api/src/main/java/"/>
-            <packageset dir="maven-scm-managers/maven-scm-manager-plexus/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-provider-bazaar/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-provider-hg/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-provider-vss/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-provider-tfs/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-provider-synergy/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-provider-local/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-provider-accurev/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-provider-starteam/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-provider-perforce/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-provider-clearcase/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java"/>
-            <packageset dir="maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java"/>
-            <packageset dir="maven-scm-test/src/main/java/"/>
-            <packageset dir="maven-scm-client/src/main/java/"/>
-        </javadoc>
-    </target>
-
-</project>

Modified: trunk/maven-scm/debian/changelog
===================================================================
--- trunk/maven-scm/debian/changelog	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/changelog	2011-09-11 21:38:47 UTC (rev 14848)
@@ -3,8 +3,9 @@
   * Team upload.
   * Switch to debhelper level 7.
   * Update Standards-Version: 3.9.2.
+  * Use Maven to build the package.
 
- -- Torsten Werner <twerner at debian.org>  Sun, 11 Sep 2011 23:00:07 +0200
+ -- Torsten Werner <twerner at debian.org>  Sun, 11 Sep 2011 23:11:17 +0200
 
 maven-scm (1.3-2) unstable; urgency=low
 

Modified: trunk/maven-scm/debian/control
===================================================================
--- trunk/maven-scm/debian/control	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/control	2011-09-11 21:38:47 UTC (rev 14848)
@@ -3,11 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk
-Build-Depends-Indep: maven-repo-helper (>= 0.7), maven-ant-helper (>> 4), ant,
- ant-optional, libmodello-java, libregexp-java, libplexus-utils-java,
- libnetbeans-cvsclient-java, libganymed-ssh2-java, libplexus-container-default-java,
- junit
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libmodello-maven-plugin-java, libplexus-maven-plugin-java, libganymed-ssh2-java,  
+ libmaven2-core-java, libnetbeans-cvsclient-java, libplexus-container-default-java,  
+ libplexus-utils-java, libregexp-java, junit (>= 3.8.2), libmaven-plugin-testing-java,  
+ default-jdk-doc, libganymed-ssh2-java, libmaven2-core-java-doc, libplexus-container-default-java-doc,  
+ libplexus-utils-java-doc, libregexp-java-doc, libmaven-javadoc-plugin-java,
+ libmaven-plugin-tools-java, subversion
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-scm
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-scm/
@@ -15,9 +17,9 @@
 
 Package: libmaven-scm-java
 Architecture: all
-Depends: ${misc:Depends}, 
- libregexp-java, libplexus-utils-java, libnetbeans-cvsclient-java, 
- libganymed-ssh2-java, libplexus-containers-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libmaven-scm-java-doc
 Description: Maven SCM provides a common API for doing SCM operations 
  Maven is a software project management and comprehension tool. Based on the
  concept of a project object model (POM), Maven can manage a project's build,
@@ -39,7 +41,8 @@
 Package: libmaven-scm-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
 Suggests: libmaven-scm-java
 Description: Maven SCM provides a common API for doing SCM operations 
  Maven is a software project management and comprehension tool. Based on the

Copied: trunk/maven-scm/debian/libmaven-scm-java-doc.doc-base.api (from rev 14846, trunk/maven-scm/debian/libmaven-scm-java.java-doc.doc-base)
===================================================================
--- trunk/maven-scm/debian/libmaven-scm-java-doc.doc-base.api	                        (rev 0)
+++ trunk/maven-scm/debian/libmaven-scm-java-doc.doc-base.api	2011-09-11 21:38:47 UTC (rev 14848)
@@ -0,0 +1,11 @@
+Document: libmaven-scm-java
+Title: API Javadoc for Maven SCM
+Author: Maven SCM developers
+Abstract: This is the API Javadoc provided for the
+ libmaven-scm-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmaven-scm-java/api/index.html
+Files: /usr/share/doc/libmaven-scm-java/api/*
+

Added: trunk/maven-scm/debian/libmaven-scm-java-doc.install
===================================================================
--- trunk/maven-scm/debian/libmaven-scm-java-doc.install	                        (rev 0)
+++ trunk/maven-scm/debian/libmaven-scm-java-doc.install	2011-09-11 21:38:47 UTC (rev 14848)
@@ -0,0 +1,2 @@
+target/site/apidocs/* usr/share/doc/libmaven-scm-java/api
+

Deleted: trunk/maven-scm/debian/libmaven-scm-java.java-doc.doc-base
===================================================================
--- trunk/maven-scm/debian/libmaven-scm-java.java-doc.doc-base	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/libmaven-scm-java.java-doc.doc-base	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,10 +0,0 @@
-Document: libmaven-scm-java
-Title: API Javadoc for Maven SCM
-Author: The Apache Software Foundation developers
-Abstract: This is the API Javadoc provided for the libmaven-scm-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libmaven-scm-java/api/index.html
-Files: /usr/share/doc/libmaven-scm-java/api/*
-

Modified: trunk/maven-scm/debian/libmaven-scm-java.poms
===================================================================
--- trunk/maven-scm/debian/libmaven-scm-java.poms	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/libmaven-scm-java.poms	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,32 +1,58 @@
-pom.xml --no-parent
-maven-scm-api/pom.xml
-maven-scm-managers/pom.xml
-maven-scm-managers/maven-scm-manager-plexus/pom.xml
-maven-scm-test/pom.xml
-maven-scm-providers/pom.xml
-maven-scm-providers/maven-scm-provider-accurev/pom.xml
-maven-scm-providers/maven-scm-provider-bazaar/pom.xml
-maven-scm-providers/maven-scm-provider-clearcase/pom.xml
-maven-scm-providers/maven-scm-providers-cvs/pom.xml
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/pom.xml
-maven-scm-providers/maven-scm-provider-hg/pom.xml
-maven-scm-providers/maven-scm-providers-git/pom.xml
-maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
-maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
-maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
-maven-scm-providers/maven-scm-provider-local/pom.xml
-maven-scm-providers/maven-scm-provider-perforce/pom.xml
-maven-scm-providers/maven-scm-providers-standard/pom.xml
-maven-scm-providers/maven-scm-provider-starteam/pom.xml
-maven-scm-providers/maven-scm-providers-svn/pom.xml
-maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
-maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
-maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml
-maven-scm-providers/maven-scm-provider-synergy/pom.xml
-maven-scm-providers/maven-scm-provider-vss/pom.xml
-maven-scm-providers/maven-scm-provider-tfs/pom.xml
-maven-scm-client/pom.xml
-maven-scm-plugin/pom.xml --no-parent
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM or
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar
+#   it will be installed with mh_install.
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars.
+#
+pom.xml --no-parent --has-package-version
+maven-scm-api/pom.xml --has-package-version
+maven-scm-managers/pom.xml --has-package-version
+maven-scm-managers/maven-scm-manager-plexus/pom.xml --has-package-version
+maven-scm-test/pom.xml --has-package-version
+maven-scm-providers/pom.xml --has-package-version
+maven-scm-providers/maven-scm-provider-accurev/pom.xml --has-package-version
+maven-scm-providers/maven-scm-provider-bazaar/pom.xml --has-package-version
+maven-scm-providers/maven-scm-provider-clearcase/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-cvs/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/pom.xml --has-package-version
+maven-scm-providers/maven-scm-provider-hg/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-git/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml --has-package-version
+maven-scm-providers/maven-scm-provider-local/pom.xml --has-package-version
+maven-scm-providers/maven-scm-provider-perforce/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-standard/pom.xml --has-package-version
+maven-scm-providers/maven-scm-provider-starteam/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-svn/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml --has-package-version
+maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml --has-package-version
+maven-scm-providers/maven-scm-provider-synergy/pom.xml --has-package-version
+# there is some issue with modello
+#maven-scm-providers/maven-scm-provider-vss/pom.xml --has-package-version
+maven-scm-providers/maven-scm-provider-tfs/pom.xml --has-package-version
+maven-scm-client/pom.xml --has-package-version
+maven-scm-plugin/pom.xml --no-parent --has-package-version

Deleted: trunk/maven-scm/debian/maven-scm-manager-plexus-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-manager-plexus-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-manager-plexus-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,16 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.manager.ScmManager</role>
-      <implementation>org.apache.maven.scm.manager.plexus.DefaultScmManager</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.scm.provider.ScmProvider</role>
-          <field-name>scmProviders</field-name>
-        </requirement>
-      </requirements>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-accurev-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-accurev-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-accurev-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>accurev</role-hint>
-      <implementation>org.apache.maven.scm.provider.accurev.AccuRevScmProvider</implementation>
-      <description>Implementation of Accurev integration with Maven SCM</description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-bazaar-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-bazaar-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-bazaar-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>bazaar</role-hint>
-      <implementation>org.apache.maven.scm.provider.bazaar.BazaarScmProvider</implementation>
-      <description>Bazaar NG http://bazaar-vcs.</description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-clearcase-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-clearcase-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-clearcase-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>clearcase</role-hint>
-      <implementation>org.apache.maven.scm.provider.clearcase.ClearCaseScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-cvsexe-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-cvsexe-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-cvsexe-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>cvs_native</role-hint>
-      <implementation>org.apache.maven.scm.provider.cvslib.cvsexe.CvsExeScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-cvsjava-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-cvsjava-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-cvsjava-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>cvs</role-hint>
-      <implementation>org.apache.maven.scm.provider.cvslib.cvsjava.CvsJavaScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-gitexe-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-gitexe-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-gitexe-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>git</role-hint>
-      <implementation>org.apache.maven.scm.provider.git.gitexe.GitExeScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-hg-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-hg-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-hg-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>hg</role-hint>
-      <implementation>org.apache.maven.scm.provider.hg.HgScmProvider</implementation>
-      <description>Mercurial (HG) is a decentralized revision control system.</description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-local-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-local-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-local-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>local</role-hint>
-      <implementation>org.apache.maven.scm.provider.local.LocalScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-perforce-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-perforce-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-perforce-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>perforce</role-hint>
-      <implementation>org.apache.maven.scm.provider.perforce.PerforceScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-starteam-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-starteam-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-starteam-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>starteam</role-hint>
-      <implementation>org.apache.maven.scm.provider.starteam.StarteamScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-svnexe-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-svnexe-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-svnexe-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>svn</role-hint>
-      <implementation>org.apache.maven.scm.provider.svn.svnexe.SvnExeScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-synergy-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-synergy-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-synergy-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>synergy</role-hint>
-      <implementation>org.apache.maven.scm.provider.synergy.SynergyScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-tfs-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-tfs-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-tfs-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>tfs</role-hint>
-      <implementation>org.apache.maven.scm.provider.tfs.TfsScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Deleted: trunk/maven-scm/debian/maven-scm-provider-vss-components.xml
===================================================================
--- trunk/maven-scm/debian/maven-scm-provider-vss-components.xml	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven-scm-provider-vss-components.xml	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,11 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.scm.provider.ScmProvider</role>
-      <role-hint>vss</role-hint>
-      <implementation>org.apache.maven.scm.provider.vss.VssScmProvider</implementation>
-      <description></description>
-      <isolated-realm>false</isolated-realm>
-    </component>
-  </components>
-</component-set>

Added: trunk/maven-scm/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/maven-scm/debian/maven.cleanIgnoreRules	                        (rev 0)
+++ trunk/maven-scm/debian/maven.cleanIgnoreRules	2011-09-11 21:38:47 UTC (rev 14848)
@@ -0,0 +1,17 @@
+# Maven clean ignore rules - ignore some Maven dependencies and plugins
+# during the clean phase of a Maven build
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM before mvn clean is called
+#   junit junit jar s/3\\..*/3.x/
+

Added: trunk/maven-scm/debian/maven.ignoreRules
===================================================================
--- trunk/maven-scm/debian/maven.ignoreRules	                        (rev 0)
+++ trunk/maven-scm/debian/maven.ignoreRules	2011-09-11 21:38:47 UTC (rev 14848)
@@ -0,0 +1,17 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+#   junit junit jar s/3\\..*/3.x/
+
+org.apache.maven.plugins maven-assembly-plugin * * * *

Added: trunk/maven-scm/debian/maven.properties
===================================================================
--- trunk/maven-scm/debian/maven.properties	                        (rev 0)
+++ trunk/maven-scm/debian/maven.properties	2011-09-11 21:38:47 UTC (rev 14848)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+

Added: trunk/maven-scm/debian/maven.publishedRules
===================================================================
--- trunk/maven-scm/debian/maven.publishedRules	                        (rev 0)
+++ trunk/maven-scm/debian/maven.publishedRules	2011-09-11 21:38:47 UTC (rev 14848)
@@ -0,0 +1,19 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+#   in this case, elements that match are transformed using
+#   the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+#   junit junit jar s/3\\..*/3.x/
+

Modified: trunk/maven-scm/debian/maven.rules
===================================================================
--- trunk/maven-scm/debian/maven.rules	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/maven.rules	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,3 +1,56 @@
-org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/
-s/regexp/jakarta-regexp/ s/regexp/jakarta-regexp/ jar s/.*/debian/
-junit junit jar s/3\..*/3.x/
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+#   in this case, elements that match are transformed using
+#   the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+#   junit junit jar s/3\\..*/3.x/
+
+junit junit jar s/3\..*/3.x/ * *
+org.apache.maven.scm maven-scm-api jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-client jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-manager-plexus jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-managers pom s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-accurev jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-bazaar jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-clearcase jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-cvs-commons jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-cvsexe jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-cvsjava jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-cvstest jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-git-commons jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-gitexe jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-gittest jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-hg jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-local jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-perforce jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-starteam jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-svn-commons jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-svnexe jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-svntest jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-synergy jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-tfs jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-vss jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-providers-cvs pom s/.*/debian/ * *
+org.apache.maven.scm maven-scm-providers-git pom s/.*/debian/ * *
+org.apache.maven.scm maven-scm-providers-standard pom s/.*/debian/ * *
+org.apache.maven.scm maven-scm-providers-svn pom s/.*/debian/ * *
+org.apache.maven.scm maven-scm-providers pom s/.*/debian/ * *
+org.apache.maven.scm maven-scm-test jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm pom s/.*/debian/ * *
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+s/regexp/jakarta-regexp/ s/regexp/jakarta-regexp/ jar s/.*/debian/ * *
+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/ * *

Added: trunk/maven-scm/debian/patches/0001-do-not-build-vss-module.patch
===================================================================
--- trunk/maven-scm/debian/patches/0001-do-not-build-vss-module.patch	                        (rev 0)
+++ trunk/maven-scm/debian/patches/0001-do-not-build-vss-module.patch	2011-09-11 21:38:47 UTC (rev 14848)
@@ -0,0 +1,21 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sun, 11 Sep 2011 23:18:03 +0200
+Subject: do not build vss module
+
+---
+ maven-scm-providers/pom.xml |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/maven-scm-providers/pom.xml b/maven-scm-providers/pom.xml
+index 40d06cc..8d86e20 100644
+--- a/maven-scm-providers/pom.xml
++++ b/maven-scm-providers/pom.xml
+@@ -47,7 +47,6 @@
+     <module>maven-scm-provider-starteam</module>
+     <module>maven-scm-providers-svn</module>
+     <module>maven-scm-provider-synergy</module>
+-    <module>maven-scm-provider-vss</module>
+     <module>maven-scm-provider-tfs</module>
+   </modules>
+ 
+-- 

Added: trunk/maven-scm/debian/patches/series
===================================================================
--- trunk/maven-scm/debian/patches/series	                        (rev 0)
+++ trunk/maven-scm/debian/patches/series	2011-09-11 21:38:47 UTC (rev 14848)
@@ -0,0 +1 @@
+0001-do-not-build-vss-module.patch

Modified: trunk/maven-scm/debian/rules
===================================================================
--- trunk/maven-scm/debian/rules	2011-09-11 21:03:50 UTC (rev 14847)
+++ trunk/maven-scm/debian/rules	2011-09-11 21:38:47 UTC (rev 14848)
@@ -1,67 +1,10 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-PACKAGE			   := $(DEB_SOURCE_PACKAGE)
-VERSION			   := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps
-DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-API_DOCS             := build/api
-SCM_PROVIDERS        := maven-scm-provider-accurev \
-                        maven-scm-provider-bazaar \
-                        maven-scm-provider-clearcase \
-                        maven-scm-provider-hg \
-                        maven-scm-provider-local \
-                        maven-scm-provider-perforce \
-                        maven-scm-providers-cvs/maven-scm-provider-cvsjava \
-                        maven-scm-providers-cvs/maven-scm-provider-cvsexe \
-                        maven-scm-providers-cvs/maven-scm-provider-cvs-commons \
-                        maven-scm-providers-git/maven-scm-provider-git-commons \
-                        maven-scm-providers-git/maven-scm-provider-gitexe \
-                        maven-scm-providers-svn/maven-scm-provider-svn-commons \
-                        maven-scm-providers-svn/maven-scm-provider-svnexe \
-                        maven-scm-provider-starteam \
-                        maven-scm-provider-synergy \
-                        maven-scm-provider-tfs \
-                        maven-scm-provider-vss
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
 
-makebuilddir/lib$(PACKAGE)-java::
-	set -e; for PROVIDER in maven-scm-managers/maven-scm-manager-plexus $(addprefix maven-scm-providers/, $(SCM_PROVIDERS)); do \
-		COMPONENT_FILE=debian/$$(echo $$PROVIDER | cut -d'/' -f2 -)-components.xml; \
-		if [ -e $$COMPONENT_FILE ]; then \
-			install -d $$PROVIDER/build/classes/META-INF/plexus; \
-			install -m644 -T $$COMPONENT_FILE $$PROVIDER/build/classes/META-INF/plexus/components.xml; \
-		fi \
-	done
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l maven-scm-api/pom.xml maven-scm-api/build/maven-scm-api-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l maven-scm-test/pom.xml maven-scm-test/build/maven-scm-test-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l maven-scm-client/pom.xml maven-scm-client/build/maven-scm-client-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l maven-scm-managers/maven-scm-manager-plexus/pom.xml maven-scm-managers/maven-scm-manager-plexus/build/maven-scm-manager-plexus-$(VERSION).jar
-	set -e; for PROVIDER in $(SCM_PROVIDERS); do \
-		mh_installjar -plib$(PACKAGE)-java -l maven-scm-providers/$$PROVIDER/pom.xml maven-scm-providers/$$PROVIDER/build/$$(echo $$PROVIDER | cut -d'/' -f2 -)-$(VERSION).jar; \
-	done
-
-binary-post-install/lib$(PACKAGE)-java-doc::
-	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
-
-clean::
-	-rm -rf debian/tmp
-
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-# Extract generated plexus components.xml files from a standard Maven build
-PLEXUS_COMPONENTS=$(shell find . -name components.xml | grep "target/classes" | grep -v scm-client | sed -re "s,.*/([a-z-]+)/target/.*,debian/\1-components.xml,")
-
-debian/%-components.xml:
-	echo $*
-	find . -type f -path *$*/target/classes/META-INF/plexus/components.xml -exec cp '{}' $@ \;
-
-copy-plexus-components: $(PLEXUS_COMPONENTS)




More information about the pkg-java-commits mailing list