[pkg-java] r3877 - in trunk/maven2/debian: . patches

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-07-19 12:23:42 +0000 (Thu, 19 Jul 2007)
New Revision: 3877

Modified:
   trunk/maven2/debian/build.xml
   trunk/maven2/debian/control
   trunk/maven2/debian/maven2.links
   trunk/maven2/debian/patches/mvn-cmd.patch
Log:
Skeleton links for maven's lib directory

Modified: trunk/maven2/debian/build.xml
===================================================================
--- trunk/maven2/debian/build.xml	2007-07-18 20:29:39 UTC (rev 3876)
+++ trunk/maven2/debian/build.xml	2007-07-19 12:23:42 UTC (rev 3877)
@@ -88,6 +88,13 @@
 <target name="jar" depends="compile">
 	<delete file="${jar}"/>
 
+	<!-- TODO -->
+	<mkdir dir="${build.dir}/META-INF"/>
+	<copy todir="${build.dir}/META-INF">
+	    <fileset dir="." includes="**/pom.xml"/>
+	    <fileset dir="." includes="**/pom.properties"/>
+	</copy>
+
 	<jar jarfile="${build.dir}/${package}${jar.suffix}"
 		basedir="${build.dir}"/>
 </target>

Modified: trunk/maven2/debian/control
===================================================================
--- trunk/maven2/debian/control	2007-07-18 20:29:39 UTC (rev 3876)
+++ trunk/maven2/debian/control	2007-07-19 12:23:42 UTC (rev 3877)
@@ -17,7 +17,9 @@
 Package: maven2
 Architecture: all
 Section: devel
-Depends: libcommons-cli-java, libjsch-java, libxalan2-java
+Depends: libcommons-cli-java, libjsch-java, libxalan2-java,
+         libdoxia-java, libjtidy-java, libplexus-interactivity-api-java,
+	 libwagon-java
 Suggests: maven2-doc
 Conflicts: maven2-binary
 Description: Java software project management and comprehension tool

Modified: trunk/maven2/debian/maven2.links
===================================================================
--- trunk/maven2/debian/maven2.links	2007-07-18 20:29:39 UTC (rev 3876)
+++ trunk/maven2/debian/maven2.links	2007-07-19 12:23:42 UTC (rev 3877)
@@ -1,15 +1,20 @@
 /etc/maven2 /usr/share/maven2/conf
 
-/usr/share/java/boot/classworlds.jar usr/share/maven2/core/boot/classworlds.jar
+
+/usr/share/maven2/conf/m2.conf /usr/share/maven2/bin/m2.conf
+
+/usr/share/java/classworlds.jar usr/share/maven2/boot/classworlds.jar
+
+
 /usr/share/java/commons-cli.jar usr/share/maven2/lib/commons-cli.jar
 /usr/share/java/commons-cli.jar /usr/share/maven2/lib/commons-cli.jar
 /usr/share/java/doxia-sink-api.jar usr/share/maven2/lib/doxia-sink-api.jar
 /usr/share/java/jsch.jar /usr/share/maven2/lib/jsch.jar
 /usr/share/java/jtidy.jar usr/share/maven2/lib/jtidy.jar
-/usr/share/java/maven-all.jar usr/share/maven2/lib/maven-all.jar
-/usr/share/java/plexus-container-default.jar usr/share/maven2/core/plexus-container-default.jar
+/usr/share/java/maven2.jar usr/share/maven2/lib/maven2.jar
+/usr/share/java/plexus-container-default.jar usr/share/maven2/lib/plexus-container-default.jar
 /usr/share/java/plexus-interactivity-api.jar usr/share/maven2/lib/plexus-interactivity-api.jar
-/usr/share/java/plexus-utils.jar usr/share/maven2/core/plexus-utils.jar
+/usr/share/java/plexus-utils.jar usr/share/maven2/lib/plexus-utils.jar
 /usr/share/java/wagon-file.jar usr/share/maven2/lib/wagon-file.jar
 /usr/share/java/wagon-http-lightweight.jar usr/share/maven2/lib/wagon-http-lightweight.jar
 /usr/share/java/wagon-http-shared.jar usr/share/maven2/lib/wagon-http-shared.jar

Modified: trunk/maven2/debian/patches/mvn-cmd.patch
===================================================================
--- trunk/maven2/debian/patches/mvn-cmd.patch	2007-07-18 20:29:39 UTC (rev 3876)
+++ trunk/maven2/debian/patches/mvn-cmd.patch	2007-07-19 12:23:42 UTC (rev 3877)
@@ -1,7 +1,7 @@
 diff -Nur maven/maven-core/src/bin/mvn maven.new/maven-core/src/bin/mvn
---- maven/maven-core/src/bin/mvn	2007-03-25 06:06:10.000000000 +0100
-+++ maven.new/maven-core/src/bin/mvn	2007-07-17 22:44:52.000000000 +0100
-@@ -37,6 +37,14 @@
+--- maven/maven-core/src/bin/mvn	2007-07-18 11:52:45.000000000 +0100
++++ maven.new/maven-core/src/bin/mvn	2007-07-18 11:54:56.000000000 +0100
+@@ -37,6 +37,10 @@
  # ----------------------------------------------------------------------------
  
  
@@ -9,10 +9,15 @@
 +  M2_HOME="/usr/share/maven2"
 +fi
 +
-+if [ -z "$JAVA_HOME" ] ; then
-+  JAVA_HOME="/usr"
-+fi
-+
- QUOTED_ARGS=""
- while [ "$1" != "" ] ; do
+ if [ -z "$JAVA_HOME" ] ; then
+   JAVA_HOME="/usr"
+ fi
+@@ -164,7 +168,7 @@
  
+ exec "$JAVACMD" \
+   $MAVEN_OPTS \
+-  -classpath "${M2_HOME}"/boot/classworlds-*.jar \
++  -classpath "${M2_HOME}"/boot/classworlds.jar \
+   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+   "-Dmaven.home=${M2_HOME}"  \
+   ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS