[pkg-java] r6569 - trunk/maven2/debian

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2008-06-21 21:39:56 +0000 (Sat, 21 Jun 2008)
New Revision: 6569

Modified:
   trunk/maven2/debian/build.xml
   trunk/maven2/debian/changelog
   trunk/maven2/debian/control
Log:
  * Added maven-toolchain to list of sub-projects to build.
    (Closes: #486938).
  * Standards version 3.8.0 (no changes necessary).


Modified: trunk/maven2/debian/build.xml
===================================================================
--- trunk/maven2/debian/build.xml	2008-06-18 19:35:14 UTC (rev 6568)
+++ trunk/maven2/debian/build.xml	2008-06-21 21:39:56 UTC (rev 6569)
@@ -33,8 +33,8 @@
 <target name="package" depends="jar,javadoc"/>
 
     <property file="debian/build.properties"/>
-    <property name="maven.mainSourceRoots" value="maven-monitor/src/main/java:maven-core/src/main/java:maven-artifact/src/main/java:maven-error-diagnostics/src/main/java:maven-profile/src/main/java:maven-settings/src/main/java:maven-plugin-registry/src/main/java:maven-plugin-api/src/main/java:maven-artifact-manager/src/main/java:maven-project/src/main/java:bootstrap/bootstrap-mini/src/main/java:bootstrap/bootstrap-installer/src/main/java:maven-reporting/maven-reporting-api/src/main/java:maven-plugin-descriptor/src/main/java:maven-artifact-test/src/main/java"/>
-    <property name="maven.generatedSourceRoots" value="maven-plugin-parameter-documenter/build/generated-sources:maven-repository-metadata/build/generated-sources:maven-model/build/generated-sources:maven-profile/build/generated-sources:maven-settings/build/generated-sources:maven-plugin-registry/build/generated-sources:maven-plugin-descriptor/build/generated-sources"/>
+    <property name="maven.mainSourceRoots" value="maven-monitor/src/main/java:maven-core/src/main/java:maven-artifact/src/main/java:maven-error-diagnostics/src/main/java:maven-profile/src/main/java:maven-settings/src/main/java:maven-plugin-registry/src/main/java:maven-plugin-api/src/main/java:maven-artifact-manager/src/main/java:maven-project/src/main/java:bootstrap/bootstrap-mini/src/main/java:bootstrap/bootstrap-installer/src/main/java:maven-reporting/maven-reporting-api/src/main/java:maven-plugin-descriptor/src/main/java:maven-artifact-test/src/main/java:maven-toolchain/src/main/java"/>
+    <property name="maven.generatedSourceRoots" value="maven-plugin-parameter-documenter/build/generated-sources:maven-repository-metadata/build/generated-sources:maven-model/build/generated-sources:maven-profile/build/generated-sources:maven-settings/build/generated-sources:maven-plugin-registry/build/generated-sources:maven-plugin-descriptor/build/generated-sources:maven-toolchain/build/generated-sources"/>
     <property name="maven.sourceRoots" value="${maven.mainSourceRoots}:${maven.generatedSourceRoots}"/>
 
 <target name="init">
@@ -70,6 +70,9 @@
     <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="java" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
     <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-reader" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
     <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-writer" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
+    <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="java" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
+    <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-reader" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
+    <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-writer" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
 </target>
 
 <target name="compile" depends="init, generate-sources">
@@ -106,6 +109,7 @@
 		<fileset dir="maven-settings/src/main/resources" />
 		<fileset dir="maven-script/maven-script-ant/src/main/resources" />
 		<fileset dir="maven-project/src/main/resources" />
+		<fileset dir="maven-toolchain/src/main/resources" />
 	</copy>
 
 	<jar jarfile="${build.dir}/${package}${jar.suffix}"
@@ -127,5 +131,6 @@
         <delete dir="maven-settings/build/generated-sources"/>
         <delete dir="maven-plugin-registry/build/generated-sources"/>
         <delete dir="maven-plugin-descriptor/build/generated-sources"/>
+        <delete dir="maven-toolchain/build/generated-sources"/>
 </target>
 </project>

Modified: trunk/maven2/debian/changelog
===================================================================
--- trunk/maven2/debian/changelog	2008-06-18 19:35:14 UTC (rev 6568)
+++ trunk/maven2/debian/changelog	2008-06-21 21:39:56 UTC (rev 6569)
@@ -1,10 +1,16 @@
-maven2 (2.0.9-2 UNRELEASED; urgency=low
+maven2 (2.0.9-2) unstable; urgency=low
 
+  [ Michael Koch ]
   * Reworked watch file to support RC versions correctly.
   * Added myself to Uploaders.
 
- -- Michael Koch <konqueror at gmx.de>  Sun, 27 Apr 2008 13:36:36 +0200
+  [ Paul Cager ]
+  * Added maven-toolchain to list of sub-projects to build.
+    (Closes: #486938).
+  * Standards version 3.8.0 (no changes necessary).
 
+ -- Paul Cager <paul-debian at home.paulcager.org>  Sat, 21 Jun 2008 20:49:29 +0000
+
 maven2 (2.0.9-1) unstable; urgency=low
 
   [ Paul Cager ]

Modified: trunk/maven2/debian/control
===================================================================
--- trunk/maven2/debian/control	2008-06-18 19:35:14 UTC (rev 6568)
+++ trunk/maven2/debian/control	2008-06-21 21:39:56 UTC (rev 6569)
@@ -10,7 +10,7 @@
   libplexus-interactivity-api-java, libplexus-utils-java (>=1:1.4.8), libwagon-java,
   maven-ant-helper
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://maven.apache.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven2
@@ -24,7 +24,6 @@
   libplexus-utils-java (>=1:1.4.8)
 Conflicts: maven2-binary
 Replaces: maven2-binary
-Homepage: http://maven.apache.org/
 Description: Java software project management and comprehension tool
  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,