[pkg-java] r6798 - trunk/liboro-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 18:33:59 +0000 (Wed, 30 Jul 2008)
New Revision: 6798

Modified:
   trunk/liboro-java/debian/changelog
   trunk/liboro-java/debian/control
   trunk/liboro-java/debian/rules
Log:
  * (Build-)depend on default-jre/-jdk.
  * Drop dependency on java-common.


Modified: trunk/liboro-java/debian/changelog
===================================================================
--- trunk/liboro-java/debian/changelog	2008-07-30 18:30:55 UTC (rev 6797)
+++ trunk/liboro-java/debian/changelog	2008-07-30 18:33:59 UTC (rev 6798)
@@ -1,3 +1,10 @@
+liboro-java (2.0.8a-5) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+  * Drop dependency on java-common.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 18:31:08 +0000
+
 liboro-java (2.0.8a-4) unstable; urgency=low
 
   * Updated watch file to match upstream correctly.

Modified: trunk/liboro-java/debian/control
===================================================================
--- trunk/liboro-java/debian/control	2008-07-30 18:30:55 UTC (rev 6797)
+++ trunk/liboro-java/debian/control	2008-07-30 18:33:59 UTC (rev 6798)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, java-gcj-compat-dev, ant
+Build-Depends: debhelper (>= 4.1.0), cdbs, default-jdk, ant
 Standards-Version: 3.7.2
 
 Package: liboro-java
 Architecture: all
-Depends: java-common, java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Description: Regular expression library for Java
  The Jakarta-ORO Java classes are a set of text-processing Java classes
  that provide Perl5 compatible regular expressions, AWK-like regular

Modified: trunk/liboro-java/debian/rules
===================================================================
--- trunk/liboro-java/debian/rules	2008-07-30 18:30:55 UTC (rev 6797)
+++ trunk/liboro-java/debian/rules	2008-07-30 18:33:59 UTC (rev 6798)
@@ -8,9 +8,8 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj
+JAVA_HOME_DIRS := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
-DEB_JARS := gnu-classpath-tools-gjdoc
 DEB_ANT_BUILD_TARGET := jar javadocs
 
 install/liboro-java::