[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4399+dfsg2-1-3-gb46ffe1

[David Paleino]

The following commit has been merged in the master branch:
commit b46ffe1398c5ff65e9b6e62c2b0ce534aed7e6d9
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Fri Sep 9 23:40:29 2011 +0200

    Add support for openjdk-7.

diff --git a/debian/changelog b/debian/changelog
index 8562aea..f35c457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ josm (0.0.svn4399+dfsg2-2) UNRELEASED; urgency=low
     upload.
   * Drop CLASSPATH setting from debian/josm.sh as Class-Path is already
     set in josm.jar.
+  * Add support for openjdk-7.
 
  -- David Paleino <dapal at debian.org>  Wed, 28 Sep 2011 11:31:57 +0200
 
diff --git a/debian/control b/debian/control
index 35eaa69..970d07c 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-osm/josm.git
 Package: josm
 Architecture: all
 Depends:
- openjdk-6-jre | sun-java6-jre
+ openjdk-6-jre | sun-java6-jre | openjdk-7
  , libcommons-codec-java
  , libgettext-commons-java (>= 0.9.6)
  , libmetadata-extractor-java
diff --git a/debian/josm.sh b/debian/josm.sh
index fa5b18f..970f597 100644
--- a/debian/josm.sh
+++ b/debian/josm.sh
@@ -11,7 +11,7 @@ ARCH="`dpkg --print-architecture`"
 
 # If OpenJDK 6 is only available headless, do not try it
 if dpkg --get-selections openjdk-6-jre | grep install$ > /dev/null ; then
-	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-sun/bin/java "
+	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-sun/bin/java "
 else
 	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-sun/bin/java"
 fi

-- 
Editor for OpenStreetMap