[SCM] UNNAMED PROJECT branch, master, updated. 0.40-2-gdabfbf1

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit dabfbf151bdc0a32138ce6ddd3d51c1f0ff1e207
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Fri Feb 24 15:33:23 2012 +0100

      * Remove the sun-java6 support since it has been
        removed from the archive
      * Provide the support for OpenJDK 7

diff --git a/debian/changelog b/debian/changelog
index 98fb43a..0527d41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 javatools (0.41) UNRELEASED; urgency=low
 
   * Switch the OpenJDK6 path to the multiarch one.
+  * Remove the sun-java6 support since it has been
+    removed from the archive
+  * Provide the support for OpenJDK 7
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 24 Feb 2012 15:31:11 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 24 Feb 2012 15:32:30 +0100
 
 javatools (0.40) unstable; urgency=low
 
diff --git a/jh_makepkg b/jh_makepkg
index a8516cf..00163c1 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -3,7 +3,7 @@
 # options:
 #    make, maven, ant, byhand
 #    app, library
-#    gcj, sun
+#    gcj
 
 COMPAT=8
 STANDARDS=3.9.2
@@ -32,10 +32,10 @@ syntax()
    echo -e "\t-k --makefiles: Builds with make"
    echo -e "\t-n --none: Create own buildsystem"
    echo -e "\tPick One:"
-   echo -e "\t-6 --sun6: Build with Sun Java <1.6 (package must be contrib)"
    echo -e "\t-g --gcj: Build with gcj"
    echo -e "\t-d --default: Build with default free platform compiler"
    echo -e "\t-o --openjdk: Build with openjdk 6"
+   echo -e "\t-o7 --openjdk7: Build with openjdk 7"
    echo -e "Environment Variables:"
    echo -e "\tDEBEMAIL: Default maintainer email address"
    echo -e "\tEMAIL: Default maintainer email address"
@@ -44,7 +44,7 @@ syntax()
    exit 1
 }
 
-ARGS="p package m maintainer e email v upstream l library a app t ant k makefile n none 6 sun6 g gcj o openjdk M maven d default" parseargs "$@"
+ARGS="p package m maintainer e email v upstream l library a app t ant k makefile n none g gcj o openjdk o7 openjdk7 M maven d default" parseargs "$@"
 
 BUILDDIR="`pwd`"
 
@@ -222,18 +222,18 @@ if [ -n "`getarg d default`" ]; then
    COMP="default"
 elif [ -n "`getarg g gcj`" ]; then
    COMP="gcj"
-elif [ -n "`getarg 6 sun6`" ]; then
-   COMP="sun6"
 elif [ -n "`getarg o openjdk`" ]; then
    COMP="open"
+elif [ -n "`getarg o7 openjdk7`" ]; then
+   COMP="open7"
 else
-   echo "Which Java runtime does it need? Free runtime, or Sun?"
+   echo "Which Java runtime does it need? Which free runtime?"
    echo "Select:"
    echo -e "\t[F] Default Free compiler/runtime (Default)"
    echo -e "\t[G] GCJ"
-   echo -e "\t[6] Sun Java 1.6 (Package must be in contrib)"
    echo -e "\t[o] OpenJDK 6"
-   echo -n "[FG6o] $ "
+   echo -e "\t[o7] OpenJDK 7"
+   echo -n "[FGoo7] $ "
    read t
    echo
    case $t in
@@ -241,9 +241,9 @@ else
          COMP="open"
          echo "Selected: OpenJDK 6"
          ;;
-      "6")
-         COMP="sun6"
-         echo "Selected: Sun 1.6"
+      "O7"|"o7")
+         COMP="open7"
+         echo "Selected: OpenJDK 7"
          ;;
       "g"|"G")
          COMP="gcj"
@@ -265,17 +265,16 @@ case $COMP in
       COMPILER=default-jdk
       JAVA_HOME=/usr/lib/jvm/default-java
    ;;
-   "sun6")
-      COMPILER=sun-java6-jdk
-      JAVA_HOME=/usr/lib/jvm/java-6-sun
-      CONTRIB=contrib/
-      JVM=sun6
-   ;;
    "open")
       COMPILER=openjdk-6-jdk
       JAVA_HOME="/usr/lib/jvm/java-6-openjdk-\$(shell dpkg-architecture -qDEB_HOST_ARCH)"
       JVM=open
    ;;
+   "open7")
+      COMPILER=openjdk-7-jdk
+      JAVA_HOME="/usr/lib/jvm/java-7-openjdk-\$(shell dpkg-architecture -qDEB_HOST_ARCH)"
+      JVM=open7
+   ;;
 esac
 
 YEAR=$(date +%Y)

-- 
UNNAMED PROJECT