[maven2] 13/87: Checkpoint of package skeleton

[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 2fe2d8aca7e552fa5e5998841dd052e8345db715
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Tue Jul 17 22:19:21 2007 +0000

    Checkpoint of package skeleton
---
 debian/build.xml             |  7 +++----
 debian/control               | 13 ++-----------
 debian/maven2.install        |  5 +++++
 debian/maven2.links          | 20 ++++++++++++++++++++
 debian/patches/mvn-cmd.patch | 18 ++++++++++++++++++
 debian/watch                 |  2 ++
 6 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index b5a52ac..561ae72 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -93,10 +93,9 @@
 </target>
 
 <target name="javadoc" depends="init">
-	<mkdir dir="${javadoc.dir}"/>
-    <javadoc destdir="${javadoc.dir}">
-        <packageset dir="${maven.sourceRoots}"/>
-	</javadoc>
+    <!-- Are javadocs useful?
+    <ant target="javadoc" antfile="${maven.build.xml}" dir="."/>
+    -->
 </target>
 
 <target name="clean" depends="init">
diff --git a/debian/control b/debian/control
index bfa0aae..471cfe8 100644
--- a/debian/control
+++ b/debian/control
@@ -17,18 +17,9 @@ Standards-Version: 3.7.2
 Package: maven2
 Architecture: all
 Section: devel
+Depends: libcommons-cli-java, libjsch-java, libxalan2-java
 Suggests: maven2-doc
+Conflicts: maven2-binary
 Description: Java software project management and comprehension tool
  .
   Homepage: http://maven.apache.org/
-
-Package: maven2-doc
-Architecture: all
-Section: doc
-Depends: classpath-doc
-Suggests: maven2
-Description:  Java software project management and comprehension tool
- .
- This package contains the documentation for maven
- .
-  Homepage: http://maven.apache.org/
diff --git a/debian/maven2.install b/debian/maven2.install
new file mode 100644
index 0000000..0df79d7
--- /dev/null
+++ b/debian/maven2.install
@@ -0,0 +1,5 @@
+maven-core/src/bin/mvn usr/bin
+maven-core/src/bin/m2 usr/bin
+
+maven-core/src/bin/m2.conf etc/maven2
+maven-core/src/conf/settings.xml /etc/maven2
diff --git a/debian/maven2.links b/debian/maven2.links
new file mode 100644
index 0000000..d9878af
--- /dev/null
+++ b/debian/maven2.links
@@ -0,0 +1,20 @@
+/etc/maven2 /usr/share/maven2/conf
+
+/usr/share/java/boot/classworlds.jar usr/share/maven2/core/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/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/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
+/usr/share/java/wagon-provider-api.jar usr/share/maven2/lib/wagon-provider-api.jar
+/usr/share/java/wagon-ssh-common.jar usr/share/maven2/lib/wagon-ssh-common.jar
+/usr/share/java/wagon-ssh-external.jar usr/share/maven2/lib/wagon-ssh-external.jar
+/usr/share/java/wagon-ssh.jar usr/share/maven2/lib/wagon-ssh.jar
+/usr/share/java/xml-apis.jar /usr/share/maven2/lib/xml-apis.jar
diff --git a/debian/patches/mvn-cmd.patch b/debian/patches/mvn-cmd.patch
new file mode 100644
index 0000000..62a28ae
--- /dev/null
+++ b/debian/patches/mvn-cmd.patch
@@ -0,0 +1,18 @@
+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 @@
+ # ----------------------------------------------------------------------------
+ 
+ 
++if [ -z "$M2_HOME" ] ; then
++  M2_HOME="/usr/share/maven2"
++fi
++
++if [ -z "$JAVA_HOME" ] ; then
++  JAVA_HOME="/usr"
++fi
++
+ QUOTED_ARGS=""
+ while [ "$1" != "" ] ; do
+ 
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..0e2a0a6
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ftp.plusline.de/ftp.apache.org/maven/binaries/maven-(.*)-bin.tar.gz debian uupdate

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