[maven2] 15/87: Skeleton links for maven's lib directory

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven2.

commit 6d51b34cbc2501e802f4be2fa4524bda9f9deb8b
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Thu Jul 19 12:23:42 2007 +0000

    Skeleton links for maven's lib directory
---
 debian/build.xml             |  7 +++++++
 debian/control               |  4 +++-
 debian/maven2.links          | 13 +++++++++----
 debian/patches/mvn-cmd.patch | 23 ++++++++++++++---------
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 561ae72..0dddf05 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -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>
diff --git a/debian/control b/debian/control
index 471cfe8..49f2346 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,9 @@ Standards-Version: 3.7.2
 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
diff --git a/debian/maven2.links b/debian/maven2.links
index d9878af..174b480 100644
--- a/debian/maven2.links
+++ b/debian/maven2.links
@@ -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
diff --git a/debian/patches/mvn-cmd.patch b/debian/patches/mvn-cmd.patch
index 62a28ae..ca1dbb5 100644
--- a/debian/patches/mvn-cmd.patch
+++ b/debian/patches/mvn-cmd.patch
@@ -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 @@ diff -Nur maven/maven-core/src/bin/mvn maven.new/maven-core/src/bin/mvn
 +  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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2.git