[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40

[David Paleino]

The following commit has been merged in the master branch:
commit 4611d3e4356e743ab72ba1c2747b8306b9e6a2ee
Author: David Paleino <dapal at debian.org>
Date:   Thu Mar 6 00:26:56 2014 +0100

    Dropped alternative dependency on obsolete JREs: openjdk-6-jre and sun-java6-jre

diff --git a/debian/changelog b/debian/changelog
index 0d16fd7..223e7b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
   * Added DEP-3 header to 07-downgrade-metadata-extractor.patch
   * Bumped debhelper compatibility to 9
   * Bumped Standards-Version to 3.9.5, no changes needed
+  * Dropped alternative dependency on obsolete JREs: openjdk-6-jre and
+    sun-java6-jre
 
- -- David Paleino <dapal at debian.org>  Thu, 06 Mar 2014 00:23:37 +0100
+ -- David Paleino <dapal at debian.org>  Thu, 06 Mar 2014 00:26:05 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 9473c74..6536f42 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/josm.git
 Package: josm
 Architecture: all
 Depends:
- openjdk-6-jre | sun-java6-jre | openjdk-7-jre
+ openjdk-7-jre
  , libcommons-codec-java
  , libgettext-commons-java (>= 0.9.6)
  , libmetadata-extractor-java (<< 2.4.0)

-- 
Editor for OpenStreetMap