[SCM] josm branch, master, updated. debian/0.0.svn4201-1-5-ged64b89

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 710390d2f7e568a86e3d842e24b4333dcffaf0e2
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Thu Jun 16 10:16:57 2011 +0200

    Build-Depend on default-jdk.

diff --git a/debian/changelog b/debian/changelog
index 95212a8..fa35776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 josm (0.0.svn4021-2) UNRELEASED; urgency=low
 
+  [ David Paleino ]
   * Switch Maintainer/Uploaders between pkg-grass and pkg-osm
   * Repository moved under pkg-osm space
 
- -- David Paleino <dapal at debian.org>  Fri, 15 Apr 2011 13:08:15 +0200
+  [ Giovanni Mascellani ]
+  * Build-Depend on default-jdk, that is used for compilation (closes: #630561).
+
+ -- Giovanni Mascellani <gio at debian.org>  Thu, 16 Jun 2011 10:16:12 +0200
 
 josm (0.0.svn4021-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1012711..96384ee 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  ant,
  debhelper (>= 8~),
  gettext,
- openjdk-6-jdk,
+ default-jdk,
  libgettext-commons-java (>= 0.9.6),
  libmetadata-extractor-java,
  libgettext-ant-tasks-java,

-- 
Java OpenStreetMap editor