[pkg-java] r12727 - trunk/commons-csv/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2010-07-05 14:19:43 +0000 (Mon, 05 Jul 2010)
New Revision: 12727

Modified:
   trunk/commons-csv/debian/changelog
   trunk/commons-csv/debian/control
   trunk/commons-csv/debian/rules
Log:
* debian/control: Fully depend on -headless runtimes
* debian/rules, debian/control: Switch to default-jdk

Modified: trunk/commons-csv/debian/changelog
===================================================================
--- trunk/commons-csv/debian/changelog	2010-07-04 22:58:10 UTC (rev 12726)
+++ trunk/commons-csv/debian/changelog	2010-07-05 14:19:43 UTC (rev 12727)
@@ -10,8 +10,12 @@
   * 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
 
   [ Kumar Appaiah ]

Modified: trunk/commons-csv/debian/control
===================================================================
--- trunk/commons-csv/debian/control	2010-07-04 22:58:10 UTC (rev 12726)
+++ trunk/commons-csv/debian/control	2010-07-05 14:19:43 UTC (rev 12727)
@@ -5,7 +5,7 @@
 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 @@
 
 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.

Modified: trunk/commons-csv/debian/rules
===================================================================
--- trunk/commons-csv/debian/rules	2010-07-04 22:58:10 UTC (rev 12726)
+++ trunk/commons-csv/debian/rules	2010-07-05 14:19:43 UTC (rev 12727)
@@ -9,7 +9,7 @@
 #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