[commons-csv] 20/35: * debian/control: Fully depend on -headless runtimes * debian/rules, debian/control: Switch to default-jdk

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository commons-csv.

commit 82499ee5f5961cb0ae200c57c8d076488f88f45b
Author: Thierry Carrez <thierry.carrez at ubuntu.com>
Date:   Mon Jul 5 14:19:43 2010 +0000

    * debian/control: Fully depend on -headless runtimes
    * debian/rules, debian/control: Switch to default-jdk
---
 debian/changelog | 6 +++++-
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6919e9..fed0bc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,11 @@ commons-csv (0.1-SNAPSHOT+svn678580-2) UNRELEASED; urgency=low
   * Added myself to Uploaders.
   * Updated Standards-Version to 3.8.3.
 
- -- Michael Koch <konqueror at gmx.de>  Wed, 04 Nov 2009 23:14:19 +0100
+  [ Thierry Carrez ]
+  * debian/control: Fully depend on -headless runtimes
+  * debian/rules, debian/control: Switch to default-jdk
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Mon, 05 Jul 2010 16:03:50 +0200
 
 commons-csv (0.1-SNAPSHOT+svn678580-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index dfd9a03..ff2ba81 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>, Michael Koch <konqueror at gmx.de>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7), cdbs (>=0.4.48), dpatch (>= 2.0),
- openjdk-6-jdk, ant-optional (>= 1.6.5), junit (>= 3.8.1)
+ default-jdk, ant-optional (>= 1.6.5), junit (>= 3.8.1)
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-csv
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-csv
@@ -13,7 +13,7 @@ Homepage: http://commons.apache.org/sandbox/csv/
 
 Package: libcommons-csv-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime-headless
+Depends: default-jre-headless | java2-runtime-headless
 Description: a Java library for working with csv (comma separated values) files
  libcommons-csv-java is the Apache Commons library for working with csv (comma
  separated value) files.
diff --git a/debian/rules b/debian/rules
index 8a25a62..b2574d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/cdbs/1/class/ant.mk
 #export DH_VERBOSE=1
 
 # Use OpenJDK
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+JAVA_HOME = /usr/lib/jvm/default-java
 
 DEB_ANT_BUILD_TARGET = init compile jar javadoc
 DEB_ANT_BUILDFILE = debian/build.xml

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-csv.git