[pkg-java] r6783 - trunk/libcommons-discovery-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 15:57:18 +0000 (Wed, 30 Jul 2008)
New Revision: 6783

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


Modified: trunk/libcommons-discovery-java/debian/changelog
===================================================================
--- trunk/libcommons-discovery-java/debian/changelog	2008-07-30 15:53:54 UTC (rev 6782)
+++ trunk/libcommons-discovery-java/debian/changelog	2008-07-30 15:57:18 UTC (rev 6783)
@@ -1,3 +1,9 @@
+libcommons-discovery-java (0.4-2) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 15:54:35 +0000
+
 libcommons-discovery-java (0.4-1) unstable; urgency=low
 
   [ Kumar Appaiah ]

Modified: trunk/libcommons-discovery-java/debian/control
===================================================================
--- trunk/libcommons-discovery-java/debian/control	2008-07-30 15:53:54 UTC (rev 6782)
+++ trunk/libcommons-discovery-java/debian/control	2008-07-30 15:57:18 UTC (rev 6783)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: libcommons-logging-java, junit,  ant, ant-optional, java-gcj-compat-dev
+Build-Depends-Indep: libcommons-logging-java, junit,  ant, ant-optional, default-jdk
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-discovery-java
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-discovery-java
@@ -12,7 +12,7 @@
 
 Package: libcommons-discovery-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-logging-java
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libcommons-logging-java
 Description: locates classes that implement a given Java interface
  The Discovery Component is about discovering, or finding,
  implementations for pluggable interfaces. It provides facilities

Modified: trunk/libcommons-discovery-java/debian/rules
===================================================================
--- trunk/libcommons-discovery-java/debian/rules	2008-07-30 15:53:54 UTC (rev 6782)
+++ trunk/libcommons-discovery-java/debian/rules	2008-07-30 15:57:18 UTC (rev 6783)
@@ -8,7 +8,7 @@
 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             := commons-logging junit $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_BUILD_TARGET := dist test.discovery