[pkg-java] r7761 - in trunk/maven-debian-helper: . bin debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-31 19:18:20 +0000 (Wed, 31 Dec 2008)
New Revision: 7761

Added:
   trunk/maven-debian-helper/bin/
   trunk/maven-debian-helper/bin/mvn-debian
Removed:
   trunk/maven-debian-helper/bin/mvn-debian
   trunk/maven-debian-helper/debian/examples
   trunk/maven-debian-helper/examples/
Modified:
   trunk/maven-debian-helper/debian/install
Log:
install mvn-debian into /usr/bin/


Copied: trunk/maven-debian-helper/bin (from rev 7660, trunk/maven-debian-helper/examples)


Property changes on: trunk/maven-debian-helper/bin
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: trunk/maven-debian-helper/bin/mvn-debian
===================================================================
--- trunk/maven-debian-helper/examples/mvn-debian	2008-12-14 20:25:36 UTC (rev 7660)
+++ trunk/maven-debian-helper/bin/mvn-debian	2008-12-31 19:18:20 UTC (rev 7761)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# This is an example script that allows running maven on the command
-# line in a similar way as our cdbs snippets work. Copy this script to
-# /usr/local/bin if you want to have it in the $PATH. Production use is
-# not supported by the maintainer of maven-debian-helper.
-
-DEB_CLASSPATH=/usr/share/java/classworlds.jar
-JAVA_OPTS=-Dclassworlds.conf=/etc/maven2/m2-debian.conf
-MAIN_CLASS=org.codehaus.classworlds.Launcher
-MAVEN_OPTS=-s/etc/maven2/settings-debian.xml
-MAVEN_REPO=/usr/share/maven-repo
-
-if [ -d debian ]; then
-  find $MAVEN_REPO -name "*.pom" | \
-    sed -e"s,^$MAVEN_REPO/,," \
-	-e"s,/\([0-9][^/]*\).*,.version = \1," \
-	-e"s,/,.,g"                            > debian/auto.properties
-  JAVA_OPTS="$JAVA_OPTS -Dproperties.file.auto=$PWD/debian/auto.properties"
-  MAVEN_OPTS="$MAVEN_OPTS -Ddebian.dir=$PWD/debian"
-fi
-
-if [ -r debian/control ]; then
-  JAR_PACKAGE=$(dh_listpackages | awk '{ print $1 }')
-  MAVEN_OPTS="$MAVEN_OPTS -Ddebian.package=$JAR_PACKAGE"
-fi
-
-
-exec java -cp $DEB_CLASSPATH $JAVA_OPTS $MAIN_CLASS "$@" $MAVEN_OPTS

Copied: trunk/maven-debian-helper/bin/mvn-debian (from rev 7698, trunk/maven-debian-helper/examples/mvn-debian)
===================================================================
--- trunk/maven-debian-helper/bin/mvn-debian	                        (rev 0)
+++ trunk/maven-debian-helper/bin/mvn-debian	2008-12-31 19:18:20 UTC (rev 7761)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# This is an example script that allows running maven on the command
+# line in a similar way as our cdbs snippets work. Copy this script to
+# /usr/local/bin if you want to have it in the $PATH. Production use is
+# not supported by the maintainer of maven-debian-helper.
+
+DEB_CLASSPATH=/usr/share/java/classworlds.jar
+JAVA_OPTS=-Dclassworlds.conf=/etc/maven2/m2-debian.conf
+MAIN_CLASS=org.codehaus.classworlds.Launcher
+MAVEN_OPTS=-s/etc/maven2/settings-debian.xml
+MAVEN_REPO=/usr/share/maven-repo
+
+AUTO_PROPS=$(mktemp)
+find $MAVEN_REPO -name "*.pom" | \
+  sed -e"s,^$MAVEN_REPO/,," \
+      -e"s,/\([0-9][^/]*\).*,.version = \1," \
+      -e"s,/,.,g"                            > $AUTO_PROPS
+JAVA_OPTS="$JAVA_OPTS -Dproperties.file.auto=$AUTO_PROPS"
+MAVEN_OPTS="$MAVEN_OPTS -Ddebian.dir=$PWD/debian"
+
+if [ -r debian/control ]; then
+  JAR_PACKAGE=$(dh_listpackages | awk '{ print $1 }')
+  MAVEN_OPTS="$MAVEN_OPTS -Ddebian.package=$JAR_PACKAGE"
+fi
+
+java -noverify -cp $DEB_CLASSPATH $JAVA_OPTS $MAIN_CLASS "$@" $MAVEN_OPTS
+
+rm $AUTO_PROPS
+

Deleted: trunk/maven-debian-helper/debian/examples
===================================================================
--- trunk/maven-debian-helper/debian/examples	2008-12-31 13:26:19 UTC (rev 7760)
+++ trunk/maven-debian-helper/debian/examples	2008-12-31 19:18:20 UTC (rev 7761)
@@ -1 +0,0 @@
-examples/*

Modified: trunk/maven-debian-helper/debian/install
===================================================================
--- trunk/maven-debian-helper/debian/install	2008-12-31 13:26:19 UTC (rev 7760)
+++ trunk/maven-debian-helper/debian/install	2008-12-31 19:18:20 UTC (rev 7761)
@@ -1,3 +1,4 @@
+bin        /usr/
 cdbs/*     /usr/share/cdbs/1/class/
 etc/*      /etc/maven2/
 maven-repo /usr/share/