[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4550+dfsg2-1-1-g9a22d4c

[David Paleino]

The following commit has been merged in the master branch:
commit 9a22d4c2a0c90bbbd87ae0eaebb2965cc10fab98
Author: David Paleino <dapal at debian.org>
Date:   Sun Dec 11 20:09:24 2011 +0100

    Fix dependency on OpenJDK 7 (Closes: #651731)

diff --git a/debian/changelog b/debian/changelog
index 8cb930e..9ca44b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn4550+dfsg2-2) UNRELEASED; urgency=low
+
+  * Fix dependency on OpenJDK 7 (Closes: #651731)
+
+ -- David Paleino <dapal at debian.org>  Sun, 11 Dec 2011 20:09:01 +0100
+
 josm (0.0.svn4550+dfsg2-1) unstable; urgency=low
 
   * Fix get-orig-source target to grab translations (Closes: #647721)
diff --git a/debian/control b/debian/control
index 9843eff..e9c6b94 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-7
+ openjdk-6-jre | sun-java6-jre | openjdk-7-jre
  , libcommons-codec-java
  , libgettext-commons-java (>= 0.9.6)
  , libmetadata-extractor-java

-- 
Editor for OpenStreetMap