[SCM] UNNAMED PROJECT branch, master, updated. 0.30-20-gf275962

[Niels Thykier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  f2759620fb4c18b55fc36363862d4b75fac16379 (commit)
      from  189f00f52059695469e78301bcee59f5ed0344b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f2759620fb4c18b55fc36363862d4b75fac16379
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Jul 2 13:37:51 2010 +0200

    Updated jh_depends handling of the --jvm argument.
    headless now turns all JREs into their headless version.
     - if given as only option, it will be read as "headless default".
    gcj now results in gcj-jre and not java-gcj-compat (which is now
     a virtual package).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    8 ++++++++
 jh_depends       |   42 +++++++++++++++++++++---------------------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2bbe439..2d5afc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,14 @@ javatools (0.32) UNRELEASED; urgency=low
   * Replaced jh_libs with jh_installlibs in the description of
     javahelper.
   * Bumped Standards-Versions to 3.9.0 - no changes required.
+  * jh_depends now treats "headless" for the --jvm option differently.
+    if "headless" is present then all JREs will be specified using
+    their headless version. If headless is the only value, it will be
+    read as "headless default".
+  * jh_depends no longer recognises "sun5" as a valid JVM, since this
+    has been removed from the archive. "sun" is now an alias of "sun6".
+  * The --jvm "gcj" value for jh_depends now uses gcj-jre and not
+    java-gcj-compat, since the latter is now a virtual package.
 
  -- Niels Thykier <niels at thykier.net>  Wed, 23 Jun 2010 16:16:59 +0200
 
diff --git a/jh_depends b/jh_depends
index a01c532..37eebbd 100755
--- a/jh_depends
+++ b/jh_depends
@@ -18,8 +18,12 @@ syntax()
    echo -e "\t-i --indep: work on all indep packages"
    echo -e "\t-a --arch: work on all arch-specific packages"
    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, sun, sun5, sun6. Can be a space-separated list."
+   echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open, sun, sun6. 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 " If \"headless\" is the only value given then it is assumed to be \"headless default\""
    exit 1
 }
 
@@ -42,13 +46,13 @@ getclassversion()
 getalternatedepends()
 {
 	if (( $1 < 48 )); then
-		echo "| java-runtime | java2-runtime | java5-runtime | java6-runtime" 
+		echo "| java-runtime$2 | java2-runtime$2 | java5-runtime$2 | java6-runtime$2"
 	elif [ "$1" == "48" ]; then
-		echo "| java2-runtime | java5-runtime | java6-runtime" 
+		echo "| java2-runtime$2 | java5-runtime$2 | java6-runtime$2"
 	elif [ "$1" == "49" ]; then
-		echo "| java5-runtime | java6-runtime"
+		echo "| java5-runtime$2 | java6-runtime$2"
 	elif [ "$1" == "50" ]; then
-		echo "| java6-runtime" 
+		echo "| java6-runtime$2"
 	else
 		echo "Warning: Class version too new to recognise ($1), might not run with any JVMs" 1>&2
 	fi
@@ -201,34 +205,30 @@ for p in $PACKAGES; do
 	fi
 
    if [ -n "$JVM" ]; then
+      if echo $JVM | grep -q headless ; then
+         headless="-headless"
+         JVM=`echo $JVM | sed s/headless//g`
+         # Check if JVM is empty now (or just whitespace)
+         [ -z "`echo $JVM | sed s/\s*//g`" ] && JVM="default"
+      fi
       for j in $JVM; do
-			alternateversiondeps=`getalternatedepends $classversion`
+	 alternateversiondeps=`getalternatedepends $classversion $headless`
          if [ -n "$JVMDEPS" ]; then
             JVMDEPS="$JVMDEPS |"
          fi
          case "$j" in
             "default"|"true")
-               JVMDEPS="default-jre $alternateversiondeps "
-               break
-               ;;
-            "headless")
-               JVMDEPS="default-jre-headless $alternateversiondeps "
+               JVMDEPS="default-jre$headless $alternateversiondeps "
                break
                ;;
             "gcj")
-               JVMDEPS="$JVMDEPS java-gcj-compat $alternateversiondeps "
-               ;;
-            "sun")
-               JVMDEPS="$JVMDEPS sun-java5-jre | sun-java6-jre  "
-               ;;
-            "sun5")
-               JVMDEPS="$JVMDEPS sun-java5-jre "
+               JVMDEPS="$JVMDEPS gcj-jre$headles $alternateversiondeps "
                ;;
-            "sun6")
-               JVMDEPS="$JVMDEPS sun-java6-jre "
+            "sun"|"sun6")
+               JVMDEPS="$JVMDEPS sun-java6-jre$headless "
                ;;
             "open")
-               JVMDEPS="$JVMDEPS openjdk-6-jre "
+               JVMDEPS="$JVMDEPS openjdk-6-jre$headless "
                ;;
             *)
                echo "Warning: unknown JVM type: $j"


hooks/post-receive
-- 
UNNAMED PROJECT