[pkg-java] r6799 - trunk/libpixie-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 18:42:29 +0000 (Wed, 30 Jul 2008)
New Revision: 6799

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


Modified: trunk/libpixie-java/debian/changelog
===================================================================
--- trunk/libpixie-java/debian/changelog	2008-07-30 18:33:59 UTC (rev 6798)
+++ trunk/libpixie-java/debian/changelog	2008-07-30 18:42:29 UTC (rev 6799)
@@ -1,3 +1,9 @@
+libpixie-java (1:0.8.8-2) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 18:40:27 +0000
+
 libpixie-java (1:0.8.8-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libpixie-java/debian/control
===================================================================
--- trunk/libpixie-java/debian/control	2008-07-30 18:33:59 UTC (rev 6798)
+++ trunk/libpixie-java/debian/control	2008-07-30 18:42:29 UTC (rev 6799)
@@ -4,13 +4,13 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Christian Bayle <bayle at debian.org>, Rene Engelhard <rene at debian.org>
 Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: java-gcj-compat-dev, ant, libjcommon-java (>= 1.0.10-1)
+Build-Depends-Indep: default-jdk, ant, libjcommon-java (>= 1.0.10-1)
 Standards-Version: 3.6.2
 
 Package: libpixie-java
 Section: libs
 Architecture: all
-Depends:  java-gcj-compat | java2-runtime, libjcommon-java (>= 1.0.10-1)
+Depends:  default-jre | java2-runtime, libjcommon-java (>= 1.0.10-1)
 Description: Java Vector Format Viewer Library
  Pixie is a WMF-File reading library originally written as converter for the 
  Pixie-ImageViewer. Pixie was long time dead and is now resurrected as 

Modified: trunk/libpixie-java/debian/rules
===================================================================
--- trunk/libpixie-java/debian/rules	2008-07-30 18:33:59 UTC (rev 6798)
+++ trunk/libpixie-java/debian/rules	2008-07-30 18:42:29 UTC (rev 6799)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon