[pkg-java] r14165 - trunk/ant/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-08-12 21:04:22 +0000 (Fri, 12 Aug 2011)
New Revision: 14165

Modified:
   trunk/ant/debian/ant-optional.poms
   trunk/ant/debian/changelog
   trunk/ant/debian/rules
Log:
* Provide ant-testutil.jar. (Closes: #637593).


Modified: trunk/ant/debian/ant-optional.poms
===================================================================
--- trunk/ant/debian/ant-optional.poms	2011-08-12 21:00:34 UTC (rev 14164)
+++ trunk/ant/debian/ant-optional.poms	2011-08-12 21:04:22 UTC (rev 14165)
@@ -14,4 +14,5 @@
 src/etc/poms/ant-jsch/pom.xml
 src/etc/poms/ant-junit/pom.xml
 src/etc/poms/ant-swing/pom.xml
+src/etc/poms/ant-testutil/pom.xml
 

Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2011-08-12 21:00:34 UTC (rev 14164)
+++ trunk/ant/debian/changelog	2011-08-12 21:04:22 UTC (rev 14165)
@@ -3,8 +3,9 @@
   * Team upload.
   * Fix FTBFS due to changes in libxml-commons-resolver1.1-java 1.2.
     (Closes: #637592).
+  * Provide ant-testutil.jar. (Closes: #637593).
 
- -- Miguel Landaeta <miguel at miguel.cc>  Fri, 12 Aug 2011 16:27:55 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Fri, 12 Aug 2011 16:33:49 -0430
 
 ant (1.8.2-2) unstable; urgency=low
 

Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules	2011-08-12 21:00:34 UTC (rev 14164)
+++ trunk/ant/debian/rules	2011-08-12 21:04:22 UTC (rev 14165)
@@ -40,7 +40,7 @@
 	# remove -SNAPSHOT from the versions in the Maven poms
 	perl -p -i -e 's/-SNAPSHOT//g' `find src/etc/poms/ -name pom.xml`
 	# the rest
-	/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Dbuild.classpath=${CLASSPATH} -propertyfile debian/ant.properties jars
+	/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Dbuild.classpath=${CLASSPATH} -propertyfile debian/ant.properties jars test-jar
 	ln -sf /usr/share/java/xml-apis.jar $(DEB_BUILDDIR)/lib/xml-apis.jar
 	ln -sf /usr/share/java/xercesImpl.jar $(DEB_BUILDDIR)/lib/xercesImpl.jar
 	touch stamp-build-ant
@@ -86,7 +86,7 @@
 	mh_installjar -pant-optional -l src/etc/poms/ant-jsch/pom.xml build/lib/ant-jsch.jar /usr/share/ant/lib/ant-jsch.jar
 	mh_installjar -pant-optional -l src/etc/poms/ant-junit/pom.xml build/lib/ant-junit.jar /usr/share/ant/lib/ant-junit.jar
 	mh_installjar -pant-optional -l src/etc/poms/ant-swing/pom.xml build/lib/ant-swing.jar /usr/share/ant/lib/ant-swing.jar
-	#mh_installjar -pant-optional src/etc/poms/ant-testutil/pom.xml ant-testutil/build/ant-testutil-$(VERSION).jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-testutil/pom.xml build/lib/ant-testutil.jar /usr/share/ant/lib/ant-testutil.jar
 	#mh_installjar -pant-optional src/etc/poms/ant-jai/pom.xml ant-jai/build/ant-jai-$(VERSION).jar
 	#mh_installjar -pant-optional src/etc/poms/ant-netrexx/pom.xml ant-netrexx/build/ant-netrexx-$(VERSION).jar
 	#mh_installjar -pant-optional src/etc/poms/ant-starteam/pom.xml ant-starteam/build/ant-starteam-$(VERSION).jar