[pkg-java] r14146 - trunk/gant/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-08-10 01:40:22 +0000 (Wed, 10 Aug 2011)
New Revision: 14146

Modified:
   trunk/gant/debian/build.xml
   trunk/gant/debian/changelog
   trunk/gant/debian/control
Log:
* New upstream release.
* Bump Standards-Version to 3.9.2. No changes were required.
* Add missing Build-Depends on libmaven-ant-tasks-java, maven2,
  libplexus-classworlds-java and libplexus-utils-java.
* Add missing Depends on ant and Recommends on maven2 and
  libmaven-ant-tasks-java.


Modified: trunk/gant/debian/build.xml
===================================================================
--- trunk/gant/debian/build.xml	2011-08-09 23:44:50 UTC (rev 14145)
+++ trunk/gant/debian/build.xml	2011-08-10 01:40:22 UTC (rev 14146)
@@ -24,8 +24,8 @@
     This Ant script provides the build needed by Debian whilst the Gradle system is not packaged.
   </description>
 
-  <property name="gantVersion" value="1.9.3"/>
-  <property name="groovyVersion" value="1.7.8"/>
+  <property name="gantVersion" value="1.9.6"/>
+  <property name="groovyVersion" value="1.8.1"/>
   <property name="mavenAntTaskVersion" value="2.0.10"/>
   <property name="ivyVersion" value="2.2.0"/>
 
@@ -33,7 +33,8 @@
 
   <property name="sourceDirectory" value="src/main/groovy"/>
   <property name="testsDirectory" value="src/test/groovy"/>
-  <property name="jarfilesDirectory" value="jarfiles"/>
+  <property name="jarfilesDirectory" value="/usr/share/java"/>
+  <property name="mavenJarfilesDirectory" value="/usr/share/maven2/lib"/>
   <property name="scriptsDirectory" value="scripts"/>
 
   <property name="buildDirectory" value="target_gant"/>
@@ -66,6 +67,9 @@
   <target name="-initializeMavenAntTask">
      <path id="mavenAntTaskJarPathId">
       <fileset dir="${jarfilesDirectory}" includes="maven-ant-tasks-${mavenAntTaskVersion}.jar"/>
+      <fileset dir="${jarfilesDirectory}" includes="plexus-classworlds.jar"/>
+      <fileset dir="${jarfilesDirectory}" includes="plexus-utils.jar"/>
+      <fileset dir="${mavenJarfilesDirectory}" includes="maven-debian-uber.jar"/>
     </path>
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="mavenAntTaskJarPathId"/>
   </target>

Modified: trunk/gant/debian/changelog
===================================================================
--- trunk/gant/debian/changelog	2011-08-09 23:44:50 UTC (rev 14145)
+++ trunk/gant/debian/changelog	2011-08-10 01:40:22 UTC (rev 14146)
@@ -1,3 +1,14 @@
+gant (1.9.6-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.2. No changes were required.
+  * Add missing Build-Depends on libmaven-ant-tasks-java, maven2,
+    libplexus-classworlds-java and libplexus-utils-java.
+  * Add missing Depends on ant and Recommends on maven2 and
+    libmaven-ant-tasks-java.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 09 Aug 2011 20:27:01 -0430
+
 gant (1.9.3-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/gant/debian/control
===================================================================
--- trunk/gant/debian/control	2011-08-09 23:44:50 UTC (rev 14145)
+++ trunk/gant/debian/control	2011-08-10 01:40:22 UTC (rev 14146)
@@ -4,15 +4,18 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>, Miguel Landaeta <miguel at miguel.cc>
 Build-Depends: cdbs, debhelper (>= 7)
-Build-Depends-Indep: ant, groovy, default-jdk
-Standards-Version: 3.9.1
+Build-Depends-Indep: ant, groovy, default-jdk, libmaven-ant-tasks-java,
+ maven2, libplexus-classworlds-java, libplexus-utils-java
+Standards-Version: 3.9.2
 Homepage: http://gant.codehaus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/gant
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/gant
 
 Package: gant
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, groovy
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, groovy,
+ ant
+Recommends: maven2, libmaven-ant-tasks-java
 Description: Groovy build framework based on scripting Ant tasks
  Gant is a build tool for scripting Ant tasks using Groovy instead of
  XML to specify the build logic. A Gant build specification is a