[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-20-gb22f03a

[David Paleino]

The following commit has been merged in the master branch:
commit b22f03a13e022fa9bdf02b65872df5209b4be065
Author: David Paleino <dapal at debian.org>
Date:   Thu Apr 1 00:39:51 2010 +0200

    add alternative openjdk-6-jre dependency to java6-runtime

diff --git a/debian/changelog b/debian/changelog
index a747c28..2c60b06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ osmosis (0.34+ds1-1) UNRELEASED; urgency=low
     - added pkg-osm to Uploaders
     - Standards-Version bumped to 3.8.4, no changes needed
     - rewrapped for easier diff'ing
+    - add alternative openjdk-6-jre dependency to java6-runtime
   * debian/rules:
     - updated get-orig-source target to strip unwanted *.jar files
   * debian/copyright updated
@@ -25,7 +26,7 @@ osmosis (0.34+ds1-1) UNRELEASED; urgency=low
   * debian/*: updated my email address
   * debian/watch: updated to new upstream distribution location
 
- -- David Paleino <dapal at debian.org>  Thu, 01 Apr 2010 00:38:26 +0200
+ -- David Paleino <dapal at debian.org>  Thu, 01 Apr 2010 00:39:35 +0200
 
 osmosis (0.31.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c116dbf..4ff8018 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Package: osmosis
 Architecture: all
 Depends:
  ant
- , java6-runtime
+ , openjdk-6-jre | java6-runtime
  , libcommons-dbcp-java
  , libjpf-java
  , libmysql-java

-- 
Osmosis, an OSM data processor