[pkg-java] r6778 - trunk/jline/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 15:26:32 +0000 (Wed, 30 Jul 2008)
New Revision: 6778

Modified:
   trunk/jline/debian/changelog
   trunk/jline/debian/control
   trunk/jline/debian/rules
Log:
* (Build-)depend on default-jre/-jdk.


Modified: trunk/jline/debian/changelog
===================================================================
--- trunk/jline/debian/changelog	2008-07-30 15:21:46 UTC (rev 6777)
+++ trunk/jline/debian/changelog	2008-07-30 15:26:32 UTC (rev 6778)
@@ -1,9 +1,13 @@
 jline (0.9.94-2) UNRELEASED; urgency=low
 
+  [Peter Eisentraut]
   * Removed myself from Uploaders
 
- -- Peter Eisentraut <petere at debian.org>  Thu, 20 Mar 2008 11:12:29 +0100
+  [Matthias Klose]
+  * (Build-)depend on default-jre/-jdk.
 
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 15:22:16 +0000
+
 jline (0.9.94-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/jline/debian/control
===================================================================
--- trunk/jline/debian/control	2008-07-30 15:21:46 UTC (rev 6777)
+++ trunk/jline/debian/control	2008-07-30 15:26:32 UTC (rev 6778)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Kumar Appaiah <akumar at ee.iitm.ac.in>
 Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, junit, java-gcj-compat-dev
+Build-Depends-Indep: ant, junit, default-jdk
 Standards-Version: 3.7.3
 Homepage: http://jline.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jline
@@ -12,7 +12,7 @@
 
 Package: libjline-java
 Architecture: all
-Depends: java-gcj-compat | java2-runtime | java1-runtime
+Depends: default-jre-headless | java2-runtime-headless | java1-runtime-headless
 Suggests: libjline-java-doc
 Description: Java library for handling console input
  JLine is a 100% pure Java library for reading and editing console input.

Modified: trunk/jline/debian/rules
===================================================================
--- trunk/jline/debian/rules	2008-07-30 15:21:46 UTC (rev 6777)
+++ trunk/jline/debian/rules	2008-07-30 15:26:32 UTC (rev 6778)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-gcj
+JAVA_HOME 		:= /usr/lib/jvm/default-java
 DEB_JARS 		:= junit
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_ANT_BUILD_TARGET    := jar javadoc