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

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-06-14 12:41:39 +0000 (Thu, 14 Jun 2007)
New Revision: 3649

Modified:
   trunk/maven2/debian/build.properties
   trunk/maven2/debian/control
   trunk/maven2/debian/rules
Log:
Added maven-ant-helper dependency
Tidied up some of the external Jar definitions

Modified: trunk/maven2/debian/build.properties
===================================================================
--- trunk/maven2/debian/build.properties	2007-06-14 12:39:27 UTC (rev 3648)
+++ trunk/maven2/debian/build.properties	2007-06-14 12:41:39 UTC (rev 3649)
@@ -11,4 +11,5 @@
                     /usr/share/java/plexus-container-default.jar:\
                     /usr/share/java/plexus-interactivity-api.jar:\
                     /usr/share/java/plexus-utils.jar:\
-                    /usr/share/java/wagon-provider-api.jar
+                    /usr/share/java/wagon-provider-api.jar:\
+		    /usr/share/maven-ant-helper/maven-ant-helper.jar

Modified: trunk/maven2/debian/control
===================================================================
--- trunk/maven2/debian/control	2007-06-14 12:39:27 UTC (rev 3648)
+++ trunk/maven2/debian/control	2007-06-14 12:41:39 UTC (rev 3649)
@@ -8,7 +8,8 @@
 		     libbcprov-java, libbcprov-java-doc,
 		     classpath-doc,
 		     libcommons-cli-java,
-		     libwagon-java            
+		     libwagon-java,
+		     maven-ant-helper
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
 Standards-Version: 3.7.2
 

Modified: trunk/maven2/debian/rules
===================================================================
--- trunk/maven2/debian/rules	2007-06-14 12:39:27 UTC (rev 3648)
+++ trunk/maven2/debian/rules	2007-06-14 12:41:39 UTC (rev 3649)
@@ -9,12 +9,33 @@
 JAVA_HOME            := /usr/lib/jvm/java-gcj
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar \
-					 /usr/share/java/junit.jar \
-					 /usr/share/java/commons-cli.jar \
-					 /usr/share/java/ant-launcher.jar \
-					 /usr/share/java/ant.jar \
-					 /usr/share/java/bsh.jar \
+			junit.jar \
+			commons-cli.jar \
+			bsh.jar \
+			\
+			../lib/doxia-core-1.0-alpha-8.jar \
+			../lib/doxia-decoration-model-1.0-alpha-8.jar \
+			../lib/doxia-sink-api-1.0-alpha-7.jar \
+			../lib/doxia-site-renderer-1.0-alpha-8.jar \
+			\
+			wagon-file.jar \
+			wagon-http-lightweight.jar \
+			wagon-http-shared.jar \
+			wagon-provider-api.jar \
+			wagon-ssh.jar \
+			wagon-ssh-common.jar \
+			wagon-ssh-external.jar \
+			\
+			classworlds.jar \
+			plexus-utils.jar \
+			plexus-container-default.jar \
+			plexus-interactivity-api.jar \
+			\
+			modello-core.jar \
+			modello-plugin-xml.jar \
+			modello-plugin-xpp3.jar \
 
+
 #    TODO - all of the build-depends above must be copied into control
 
 DEB_ANT_BUILD_TARGET := package