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

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-09 17:35:18 +0000 (Thu, 09 Jul 2009)
New Revision: 9041

Removed:
   trunk/maven-repo-helper/src/main/bin/mh_genrules
Modified:
   trunk/maven-repo-helper/debian/changelog
   trunk/maven-repo-helper/pom.xml
   trunk/maven-repo-helper/src/main/share/mh_lib.sh
Log:
Move mh_genrules scripts to the maven-debian-helper package,
as it needs mh_lspoms and other components from this package.

Modified: trunk/maven-repo-helper/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog	2009-07-09 16:59:37 UTC (rev 9040)
+++ trunk/maven-repo-helper/debian/changelog	2009-07-09 17:35:18 UTC (rev 9041)
@@ -1,3 +1,10 @@
+maven-repo-helper (0.6) experimental; urgency=low
+
+  * Move mh_genrules scripts to the maven-debian-helper package,
+    as it needs mh_lspoms and other components from this package.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 09 Jul 2009 15:53:25 +0100
+
 maven-repo-helper (0.5) unstable; urgency=low
 
   * Initial release. (Closes: #521947)

Modified: trunk/maven-repo-helper/pom.xml
===================================================================
--- trunk/maven-repo-helper/pom.xml	2009-07-09 16:59:37 UTC (rev 9040)
+++ trunk/maven-repo-helper/pom.xml	2009-07-09 17:35:18 UTC (rev 9041)
@@ -5,7 +5,7 @@
     <artifactId>maven-repo-helper</artifactId>
     <name>Maven Repo helper</name>
     <packaging>jar</packaging>
-    <version>0.5</version>
+    <version>0.6</version>
     <description>Provides support for managing the Maven repository in a Debian distribution.</description>
 
     <inceptionYear>2009</inceptionYear>

Deleted: trunk/maven-repo-helper/src/main/bin/mh_genrules
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_genrules	2009-07-09 16:59:37 UTC (rev 9040)
+++ trunk/maven-repo-helper/src/main/bin/mh_genrules	2009-07-09 17:35:18 UTC (rev 9041)
@@ -1,87 +0,0 @@
-#!/bin/bash --
-
-. /usr/share/maven-repo-helper/mh_lib.sh
-
-syntax()
-{
-   echo -e "Usage: mh_genrules [option]... <package>"
-   echo -e "Generate the rules file, at least partially."
-   echo -e ""
-   echo -e "Where"
-   echo -e "\t<package> is the name of the binary package,"
-   echo -e "\t  e.g. libcommons-lang-java. Default to the first binary"
-   echo -e "\t  found in the debian/control file"
-   echo -e "Options:"
-   echo -e "\t-h --help: show this text"
-   echo -e "\t-V --version: show the version"
-   echo -e "\t-a --use-ant: add code to use Ant to build the sources"
-   exit 1
-}
-
-ARGS="a use-ant" parseargs "$@"
-
-if [ "$ARGC" -gt "0" ]; then
-	PACKAGE="${ARGV[0]}"
-else
-	PACKAGE=$(dh_listpackages | head -1)
-fi
-
-mh_lspoms $PACKAGE > /dev/null
-
-BIN_PACKAGE="\$(PACKAGE)"
-SOURCE=$(dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-if [ "lib$SOURCE-java" = "$PACKAGE" ]; then
-    BIN_PACKAGE="lib\$(PACKAGE)-java"
-elif [ "$SOURCE-java" = "$PACKAGE" ]; then
-    BIN_PACKAGE="\$(PACKAGE)-java"
-fi
-
-gen_rules() {
-    echo "#!/usr/bin/make -f"
-    echo ""
-    echo "include /usr/share/cdbs/1/rules/debhelper.mk"
-    if $USE_ANT ; then
-        echo "include /usr/share/cdbs/1/class/ant.mk"
-    fi
-    echo ""
-    echo "PACKAGE              := \$(DEB_SOURCE_PACKAGE)"
-    echo "VERSION              := \$(DEB_UPSTREAM_VERSION)"
-    echo "JAVA_HOME            := /usr/lib/jvm/default-java"
-    if $USE_ANT ; then
-        echo "DEB_JARS             := # TODO - fill the list of jars"
-        echo "DEB_ANT_BUILD_TARGET := package"
-        echo "DEB_ANT_BUILDFILE    := debian/build.xml"
-        echo "DEB_ANT_ARGS         := -Dpackage=\$(PACKAGE) -DartifactId=\$(PACKAGE) -Dversion=\$(VERSION)"
-    fi
-    echo ""
-    echo "binary-post-install/$BIN_PACKAGE::"
-    echo -e "\tmh_installpoms -p$BIN_PACKAGE"
-
-    cat debian/$PACKAGE.poms | while read POM OPTS; do
-        if [[ "$POM" = "pom.xml" || "$POM" = "debian/pom.xml" ]]; then
-            grep "<packaging>\s*pom" $POM > /dev/null
-            if [ $? != 0 ]; then
-                echo -e "\tmh_installjar -p$BIN_PACKAGE -l $POM build/\$(PACKAGE)-\$(VERSION).jar"
-            fi
-        elif [ ! -z "$POM" ]; then
-            BASENAME=$(basename $(dirname $POM))
-            grep "<packaging>\s*pom" $POM > /dev/null
-            if [ $? != 0 ]; then
-                echo -e "\tmh_installjar -p$BIN_PACKAGE -l $POM $BASENAME/build/$BASENAME-\$(VERSION).jar"
-            fi
-        fi
-    done
-    echo ""
-    echo "clean::"
-    echo -e "\t-rm -rf debian/tmp"
-}
-
-if [ -e debian/rules ]; then
-    gen_rules > debian/rules.new
-    echo "The new rules have been generated into debian/rules.new."
-    echo "You need to merge them manually into debian/rules"
-else
-    mkdir -p debian
-    gen_rules > debian/rules
-    echo "The new rules have been generated into debian/rules."
-fi

Modified: trunk/maven-repo-helper/src/main/share/mh_lib.sh
===================================================================
--- trunk/maven-repo-helper/src/main/share/mh_lib.sh	2009-07-09 16:59:37 UTC (rev 9040)
+++ trunk/maven-repo-helper/src/main/share/mh_lib.sh	2009-07-09 17:35:18 UTC (rev 9041)
@@ -4,7 +4,7 @@
 # - package selection
 #
 
-MH_VERSION=${MH_VERSION:-0.5}
+MH_VERSION=${MH_VERSION:-0.6}
 CLASSPATH=/usr/share/java/stax-api.jar:/usr/share/java/stax.jar:/usr/share/java/xml-apis.jar:/usr/share/java/maven-repo-helper.jar
 JAVA_OPTIONS=-Djavax.xml.stream.XMLOutputFactory=com.bea.xml.stream.XMLOutputFactoryBase