[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3514-2

[David Paleino]

The following commit has been merged in the master branch:
commit 91ec66ba2d874f7264c296144cf4a9226115dfc7
Author: David Paleino <dapal at debian.org>
Date:   Wed Oct 6 10:25:57 2010 +0200

    debian/control: use openjdk-6-jdk instead of default-jdk, to ease sync to Ubuntu.

diff --git a/debian/changelog b/debian/changelog
index 41bce61..7fe7ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ josm (0.0.svn3514-2) UNRELEASED; urgency=low
   * debian/patches/90-fix_version.patch added, fix inconsistency
     between code and upstream website. Thanks to Mario Izquierdo
     (Closes: #598920)
+  * debian/control: use openjdk-6-jdk instead of default-jdk, to ease
+    sync to Ubuntu.
 
- -- David Paleino <dapal at debian.org>  Sun, 03 Oct 2010 11:37:39 +0200
+ -- David Paleino <dapal at debian.org>  Wed, 06 Oct 2010 10:25:35 +0200
 
 josm (0.0.svn3514-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c22e196..a90fff5 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  ant,
  debhelper (>= 7.0.50~),
  gettext,
- default-jdk (>= 1:1.6),
+ openjdk-6-jdk,
  libgettext-commons-java (>= 0.9.6),
  libmetadata-extractor-java,
  libgettext-ant-tasks-java,

-- 
Java OpenStreetMap editor