Hi pkg-osm team,

[Last one for today :)]

As I'm openjdk-7 maintainer and user of josm, I've added support for openjdk-7 
into josm.sh. Please find attached patch.

Cheers,

PS: Please keep me in CC as I'm not subscribed.
-- 
Damien - Debian Developper
http://wiki.debian.org/DamienRaudeMorvan
From d709613039a2908602697bf95d0a58b26b9f7c2d Mon Sep 17 00:00:00 2001
From: Damien Raude-Morvan <draz...@debian.org>
Date: Fri, 9 Sep 2011 23:40:29 +0200
Subject: [PATCH 3/3] Add support for openjdk-7.

---
 debian/control |    2 +-
 debian/josm.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
-- 
1.7.5.4

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Pkg-osm-maint mailing list
Pkg-osm-maint@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-maint

Reply via email to