[pkg-java] r9004 - in trunk/maven-plugin-tools/debian: . patches

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-08 22:34:14 +0000 (Wed, 08 Jul 2009)
New Revision: 9004

Modified:
   trunk/maven-plugin-tools/debian/build.xml
   trunk/maven-plugin-tools/debian/changelog
   trunk/maven-plugin-tools/debian/control
   trunk/maven-plugin-tools/debian/patches/series
Log:
* New version

Modified: trunk/maven-plugin-tools/debian/build.xml
===================================================================
--- trunk/maven-plugin-tools/debian/build.xml	2009-07-08 21:39:12 UTC (rev 9003)
+++ trunk/maven-plugin-tools/debian/build.xml	2009-07-08 22:34:14 UTC (rev 9004)
@@ -54,28 +54,19 @@
       version="1.0.0"/>
   </target>
 
-  <macrodef name="patchpom">
-    <attribute name="dir"/>
-    <attribute name="args" default="" />
-    <sequential>
-      <java classpath="/usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar"
-         classname="org.debian.maven.repo.POMCleaner" fork="true" dir="@{dir}" >
-          <arg value="-plib${package}-java" />
-         <arg value="-r${basedir}/debian/maven.rules" />
-         <arg line="--keep-pom-version @{args}" />
-         <arg value="pom.xml.save" />
-         <arg value="pom.xml" />
-         <arg value="pom.properties" />
-      </java> 
-    </sequential>
-  </macrodef>
-
   <macrodef name="package-and-local-deploy">
       <attribute name="dir"/>
+      <attribute name="project.dir" default="@{dir}"/>
       <attribute name="artifactId" default="@{dir}"/>
       <attribute name="group" default="plugin-tools"/>
       <sequential>
-        <packagemodule dir="@{dir}"/>
+		<ant target="package" antfile="${maven.build}" dir="@{dir}">
+          <property name="debian.dir" location="debian" />
+          <property name="project.dir" value="@{project.dir}" />
+          <property name="package" value="${package}" />
+          <property name="use-local-repo" value="true" />
+          <property name="keep-cleaned-pom" value="true" />
+		</ant>
         <mkdir dir="debian/tmp/maven-repo/org/apache/maven/@{group}/@{artifactId}/${version}" />
         <mkdir dir="debian/tmp/maven-repo/org/apache/maven/@{group}/@{artifactId}/debian" />
         <copy file="@{dir}/pom.xml" 
@@ -95,18 +86,6 @@
       <globmapper from="*" to="*.save"/>
     </copy>
 
-    <patchpom dir="." args="--no-parent" />
-    <mkdir dir="debian/tmp/maven-repo/org/apache/maven/plugin-tools/maven-plugin-tools/${version}" />
-    <copy file="pom.xml" tofile="debian/tmp/maven-repo/org/apache/maven/plugin-tools/maven-plugin-tools/${version}/maven-plugin-tools-${version}.pom" />
-
-    <patchpom dir="maven-plugin-tools-api" />
-    <patchpom dir="maven-plugin-tools-model" />
-    <patchpom dir="maven-plugin-tools-ant" />
-    <patchpom dir="maven-plugin-tools-beanshell" />
-    <patchpom dir="maven-plugin-tools-java" />
-    <patchpom dir="maven-plugin-tools-javadoc" />
-    <patchpom dir="maven-plugin-plugin" args="--no-parent" />
-
     <!-- Create a dummy plugin descriptor to help plugin-plugin to bootstrap itself. 
       The real descriptor will be generated by calling mvn plugin:descriptor -->
     <mkdir dir="maven-plugin-plugin/${build.outputDirectory}/META-INF/maven/" />
@@ -116,6 +95,7 @@
       </filterset>
     </copy>
 
+    <package-and-local-deploy dir="." project.dir="" artifactId="maven-plugin-tools" />
     <package-and-local-deploy dir="maven-plugin-tools-api" />
     <package-and-local-deploy dir="maven-plugin-tools-model" />
     <package-and-local-deploy dir="maven-plugin-tools-ant"/>

Modified: trunk/maven-plugin-tools/debian/changelog
===================================================================
--- trunk/maven-plugin-tools/debian/changelog	2009-07-08 21:39:12 UTC (rev 9003)
+++ trunk/maven-plugin-tools/debian/changelog	2009-07-08 22:34:14 UTC (rev 9004)
@@ -1,4 +1,4 @@
-maven-plugin-tools (2.5-0ubuntu1~ppa23) jaunty; urgency=low
+maven-plugin-tools (2.5-1) unstable; urgency=low
 
   * New upstream version, add myself to Uploaders
   * Change section to java, bump up Standards-Version to 3.8.1

Modified: trunk/maven-plugin-tools/debian/control
===================================================================
--- trunk/maven-plugin-tools/debian/control	2009-07-08 21:39:12 UTC (rev 9003)
+++ trunk/maven-plugin-tools/debian/control	2009-07-08 22:34:14 UTC (rev 9004)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: ant, debhelper (>= 5), cdbs, default-jdk, quilt, libjaxp1.3-java
+Build-Depends: debhelper (>= 5), cdbs, default-jdk, quilt, libjaxp1.3-java
 Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
  libmodello-java, libclassworlds-java, junit, libplexus-velocity-java, velocity,
  libmaven-reporting-impl-java, libdoxia-sitetools-java,

Modified: trunk/maven-plugin-tools/debian/patches/series
===================================================================
--- trunk/maven-plugin-tools/debian/patches/series	2009-07-08 21:39:12 UTC (rev 9003)
+++ trunk/maven-plugin-tools/debian/patches/series	2009-07-08 22:34:14 UTC (rev 9004)
@@ -1,2 +1,3 @@
+jtidy.diff
 pom.diff
-jtidy.diff
+