[pkg-java] r6796 - trunk/libjdepend-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 17:57:08 +0000 (Wed, 30 Jul 2008)
New Revision: 6796

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


Modified: trunk/libjdepend-java/debian/changelog
===================================================================
--- trunk/libjdepend-java/debian/changelog	2008-07-30 17:54:13 UTC (rev 6795)
+++ trunk/libjdepend-java/debian/changelog	2008-07-30 17:57:08 UTC (rev 6796)
@@ -1,3 +1,9 @@
+libjdepend-java (2.9-5) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 17:54:40 +0000
+
 libjdepend-java (2.9-4) unstable; urgency=low
 
   * Use java-gcj-compat instead of kaffe.

Modified: trunk/libjdepend-java/debian/control
===================================================================
--- trunk/libjdepend-java/debian/control	2008-07-30 17:54:13 UTC (rev 6795)
+++ trunk/libjdepend-java/debian/control	2008-07-30 17:57:08 UTC (rev 6796)
@@ -3,12 +3,12 @@
 Priority: optional
 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>
-Build-Depends: debhelper (>= 4.2.30), java-gcj-compat-dev, ant, ant-optional, cdbs
+Build-Depends: debhelper (>= 4.2.30), default-jdk, ant, ant-optional, cdbs
 Standards-Version: 3.7.2
 
 Package: libjdepend-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Description: tool to measure design quality of java class and source
  JDepend traverses Java class and source file directories and 
  generates design quality metrics for each Java package. JDepend allows 

Modified: trunk/libjdepend-java/debian/rules
===================================================================
--- trunk/libjdepend-java/debian/rules	2008-07-30 17:54:13 UTC (rev 6795)
+++ trunk/libjdepend-java/debian/rules	2008-07-30 17:57:08 UTC (rev 6796)
@@ -7,7 +7,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-gcj
+JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar junit.jar $(ANT_HOME)/lib/ant-junit.jar
 DEB_ANT_BUILD_TARGET := jar javadoc #test