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

[Trygve Laugstøl]

paulcager-guest at alioth.debian.org wrote:
> Author: paulcager-guest
> Date: 2007-07-17 22:19:21 +0000 (Tue, 17 Jul 2007)
> New Revision: 3873
> 
> Added:
>    trunk/maven2/debian/maven2.install
>    trunk/maven2/debian/maven2.links
>    trunk/maven2/debian/patches/
>    trunk/maven2/debian/patches/mvn-cmd.patch
>    trunk/maven2/debian/watch
> Modified:
>    trunk/maven2/debian/build.xml
>    trunk/maven2/debian/control
> Log:
> Checkpoint of package skeleton
> 
> Modified: trunk/maven2/debian/build.xml
> ===================================================================
> --- trunk/maven2/debian/build.xml	2007-07-17 18:27:35 UTC (rev 3872)
> +++ trunk/maven2/debian/build.xml	2007-07-17 22:19:21 UTC (rev 3873)
> @@ -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">
> 
> Modified: trunk/maven2/debian/control
> ===================================================================
> --- trunk/maven2/debian/control	2007-07-17 18:27:35 UTC (rev 3872)
> +++ trunk/maven2/debian/control	2007-07-17 22:19:21 UTC (rev 3873)
> @@ -17,18 +17,9 @@
>  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/
> 
> Added: trunk/maven2/debian/maven2.install
> ===================================================================
> --- trunk/maven2/debian/maven2.install	                        (rev 0)
> +++ trunk/maven2/debian/maven2.install	2007-07-17 22:19:21 UTC (rev 3873)
> @@ -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
> 
> Added: trunk/maven2/debian/maven2.links
> ===================================================================
> --- trunk/maven2/debian/maven2.links	                        (rev 0)
> +++ trunk/maven2/debian/maven2.links	2007-07-17 22:19:21 UTC (rev 3873)
> @@ -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
> 
> Added: trunk/maven2/debian/patches/mvn-cmd.patch
> ===================================================================
> --- trunk/maven2/debian/patches/mvn-cmd.patch	                        (rev 0)
> +++ trunk/maven2/debian/patches/mvn-cmd.patch	2007-07-17 22:19:21 UTC (rev 3873)
> @@ -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

That one is most likely not going to work as /usr isn't a standard Java 
home.

Maven assumes it can find tools.jar under $JAVA_HOME/lib/tools.jar IIRC.

--
Trygve