[pkg-java] r11897 - in trunk/maven-repo-helper: debian src/main/bin

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-03-19 21:38:09 +0000 (Fri, 19 Mar 2010)
New Revision: 11897

Modified:
   trunk/maven-repo-helper/debian/changelog
   trunk/maven-repo-helper/src/main/bin/mh_installjar
Log:
mh_installjar: Add new -e/--set-version switchs and handle
them as we already do in mh_installpom.

Modified: trunk/maven-repo-helper/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog	2010-03-19 19:00:44 UTC (rev 11896)
+++ trunk/maven-repo-helper/debian/changelog	2010-03-19 21:38:09 UTC (rev 11897)
@@ -1,3 +1,10 @@
+maven-repo-helper (1.0.5) unstable; urgency=low
+
+  * mh_installjar: Add new -e/--set-version switchs and handle
+    them as we already do in mh_installpom.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 19 Mar 2010 22:34:26 +0100
+
 maven-repo-helper (1.0.4) unstable; urgency=low
 
   * Fix "ignores the --no-parent option in the .poms file" (Closes: #573049)

Modified: trunk/maven-repo-helper/src/main/bin/mh_installjar
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_installjar	2010-03-19 19:00:44 UTC (rev 11896)
+++ trunk/maven-repo-helper/src/main/bin/mh_installjar	2010-03-19 21:38:09 UTC (rev 11897)
@@ -26,6 +26,8 @@
    echo -e "\t-h --help: show this text"
    echo -e "\t-V --version: show the version"
    echo -e "\t-p<package> --package=<package>: package to act on "
+   echo -e "\t-e<version>, --set-version=<version>: set the version for the POM,"
+   echo -e "\t  do not use the version declared in the POM file."
    echo -e "\t-r<rules> --rules=<rules>: gives the location of the rules file for"
    echo -e "\t  special properties. Optional, the default location is"
    echo -e "\t  debian/maven.rules"
@@ -64,6 +66,7 @@
 RULES=$(getarg r rules)
 PACKAGE=$(getarg p package)
 PACKAGE=${PACKAGE:?"Package parameter (-p) is mandatory"}
+SETVERSION=$(getarg e set-version)
 JAVALIB=$(getarg l java-lib)
 USJ_JAR_NAME=$(getarg n usj-name)
 NO_USJ_VERSIONLESS=$(getarg s no-usj-versionless)
@@ -75,7 +78,7 @@
 JAR="${ARGV[1]}"
 
 DH_OPTS="${VERBOSE:+-v} ${NOACT:+-n}"
-CLEAN_ARGS="--package=${PACKAGE} ${RULES:+--rules=$RULES}"
+CLEAN_ARGS="--package=${PACKAGE} ${SETVERSION:+--set-version=$SETVERSION} ${RULES:+--rules=$RULES}"
 
 mkdir -p debian/tmp 2> /dev/null