[pkg-java] r7066 - trunk/libjdom1-java/debian

[marcusb-guest at alioth.debian.org]

Author: marcusb-guest
Date: 2008-09-29 09:56:36 +0000 (Mon, 29 Sep 2008)
New Revision: 7066

Modified:
   trunk/libjdom1-java/debian/changelog
   trunk/libjdom1-java/debian/control
   trunk/libjdom1-java/debian/rules
Log:
(Build-)depend on default-jdk-builddep and default-jre-headless.

Modified: trunk/libjdom1-java/debian/changelog
===================================================================
--- trunk/libjdom1-java/debian/changelog	2008-09-29 09:40:14 UTC (rev 7065)
+++ trunk/libjdom1-java/debian/changelog	2008-09-29 09:56:36 UTC (rev 7066)
@@ -7,9 +7,10 @@
   * debian/control: Added Homepage and Vcs-* fields.
   * debian/control: Bump Standards-Version (no changes needed).
   * Use debhelper 7 rather instead of cdbs.
-  
- -- Marcus Better <marcus at better.se>  Fri, 26 Sep 2008 17:59:31 +0200
+  * (Build-)depend on default-jdk-builddep and default-jre-headless.
 
+ -- Marcus Better <marcus at better.se>  Mon, 29 Sep 2008 11:49:02 +0200
+
 libjdom1-java (1.0-4) unstable; urgency=low
 
   * Build with java-gcj-compat-dev and libjaxen-java

Modified: trunk/libjdom1-java/debian/control
===================================================================
--- trunk/libjdom1-java/debian/control	2008-09-29 09:40:14 UTC (rev 7065)
+++ trunk/libjdom1-java/debian/control	2008-09-29 09:56:36 UTC (rev 7066)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>
-Build-Depends-Indep: debhelper(>= 7, java-gcj-compat-dev, ant, libjaxen-java
+Build-Depends-Indep: debhelper(>= 7), default-jdk-builddep, ant, libjaxen-java
 Standards-Version: 3.8.0.1
 Homepage: http://jdom.org
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjdom1-java
@@ -11,7 +11,7 @@
 
 Package: libjdom1-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java-runtime-headless
 Suggests: java-virtual-machine
 Description: lightweight and fast library using XML
  JDOM is, quite simply, a Java representation of an XML document. JDOM

Modified: trunk/libjdom1-java/debian/rules
===================================================================
--- trunk/libjdom1-java/debian/rules	2008-09-29 09:40:14 UTC (rev 7065)
+++ trunk/libjdom1-java/debian/rules	2008-09-29 09:56:36 UTC (rev 7066)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-JAVA_HOME	:= /usr/lib/jvm/java-gcj
+JAVA_HOME	:= /usr/lib/jvm/default-java
 DEB_JARS    := ant ant-launcher jaxen
 
 DEB_CLASSPATH = $(shell for jar in $(DEB_JARS:%=/usr/share/java/%.jar); do \