[SCM] osmosis branch, master, updated. debian/0.31.2-2-52-ga72bb6c

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit a72bb6cc5ee4dab3b1ecbc67ebafb3c6207c294c
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Feb 13 10:21:22 2011 +0100

    Use headless JRE and default-jdk.

diff --git a/debian/changelog b/debian/changelog
index 982f2bb..8b3bcf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ osmosis (0.38+ds2-1) UNRELEASED; urgency=low
     - 00-fix_build.patch: removed, build system has completely changed;
     - 01-fix_launcher.patch, 02-fix_plexus.patch: files moved, conflicts
       resolved.
+  * Depend on headless runtime environment and use default-jdk at
+    building time (closes: #613135).
 
- -- Giovanni Mascellani <gio at debian.org>  Tue, 11 Jan 2011 18:56:28 +0100
+ -- Giovanni Mascellani <gio at debian.org>  Sun, 13 Feb 2011 10:20:06 +0100
 
 osmosis (0.34+ds1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6678f83..7945c95 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
  , libspring-jdbc-2.5-java
  , libspring-tx-2.5-java
  , libwoodstox-java
- , openjdk-6-jdk
+ , default-jdk
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/pkg-grass/osmosis.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/osmosis.git
@@ -33,7 +33,7 @@ Package: osmosis
 Architecture: all
 Depends:
  ant
- , openjdk-6-jre | java6-runtime
+ , default-jre-headless | java6-runtime-headless
  , libcommons-codec-java
  , libcommons-compress-java
  , libcommons-dbcp-java

-- 
Osmosis, an OSM data processor