[SCM] UNNAMED PROJECT branch, master, updated. 0.41-1-g543e5c5

[Niels Thykier]

The following commit has been merged in the master branch:
commit 543e5c5bd2b524f9cf4cdd51d827d6618d5fe3a6
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jun 19 11:42:14 2012 +0200

    jh_depends: Add support for OpenJDK-7
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 90fc7bc..7c68269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+javatools (0.42) UNRELEASED; urgency=low
+
+  * Add support for Java7 in jh_depends.  The jvm "open" now
+    defaults to any OpenJDK version.  The "open6" and "open7"
+    values can be used to depend on a specific one.
+
+ -- Niels Thykier <niels at thykier.net>  Tue, 19 Jun 2012 11:28:58 +0200
+
 javatools (0.41) unstable; urgency=low
 
   [ Sylvestre Ledru ]
diff --git a/jh_depends b/jh_depends
index e50f2ab..7993f7f 100755
--- a/jh_depends
+++ b/jh_depends
@@ -19,11 +19,11 @@ syntax()
    echo -e "\t-a --arch: work on all arch-specific packages"
    echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
    echo -e "\t-n --no-act: don't actually do anything, just print the results"
-   echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open. Can be a space-separated list."
+   echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open, open6 or open7. Can be a space-separated list."
    echo -e "\t-X<package> --exclude=<package>: don't add this package to depends"  
    echo -e ""
-   echo -e "Note: \"headless\" (for --jvm) affects other values and alternatives (e.g. java6-runtime becomes"
-   echo -e " java6-runtime-headless) and \"default\" cannot be used with any other value except \"headless\""
+   echo -e "Note: \"headless\" (for --jvm) affects other values and alternatives (e.g. java7-runtime becomes"
+   echo -e " java7-runtime-headless) and \"default\" cannot be used with any other value except \"headless\""
    echo -e " If \"headless\" is the only value given then it is assumed to be \"headless default\""
    exit 1
 }
@@ -47,9 +47,11 @@ getclassversion()
 getalternatedepends()
 {
 	if (( $1 < 50 )); then
-		echo "| java5-runtime$2 | java6-runtime$2"
+		echo "| java5-runtime$2 | java6-runtime$2 | java7-runtime$2"
 	elif [ "$1" == "50" ]; then
-		echo "| java6-runtime$2"
+		echo "| java6-runtime$2 | java7-runtime$2"
+	elif [ "$1" == "51" ]; then
+		echo "| java7-runtime$2"
 	else
 		echo "Warning: Class version too new to recognise ($1), might not run with any JVMs" 1>&2
 	fi
@@ -68,7 +70,10 @@ function home-to-jvm()
 		JVM="$JVM gcj"
 	fi
 	if echo $JHOME | grep 6-openjdk >/dev/null; then
-		JVM="$JVM open"
+		JVM="$JVM open6"
+	fi
+	if echo $JHOME | grep 7-openjdk >/dev/null; then
+		JVM="$JVM open7"
 	fi
 	echo "$JVM"
 }
@@ -219,9 +224,15 @@ for p in $PACKAGES; do
             "gcj")
                JVMDEPS="$JVMDEPS gcj-jre$headles $alternateversiondeps "
                ;;
-            "open")
+            "open7")
+               JVMDEPS="$JVMDEPS openjdk-7-jre$headless "
+               ;;
+            "open6")
                JVMDEPS="$JVMDEPS openjdk-6-jre$headless "
                ;;
+            "open")
+               JVMDEPS="$JVMDEPS openjdk-7-jre$headless | openjdk-6-jre$headless "
+               ;;
             *)
                echo "Warning: unknown JVM type: $j"
                ;;

-- 
UNNAMED PROJECT