[pkg-java] r6793 - trunk/libitext-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 17:46:43 +0000 (Wed, 30 Jul 2008)
New Revision: 6793

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


Modified: trunk/libitext-java/debian/changelog
===================================================================
--- trunk/libitext-java/debian/changelog	2008-07-30 17:38:32 UTC (rev 6792)
+++ trunk/libitext-java/debian/changelog	2008-07-30 17:46:43 UTC (rev 6793)
@@ -1,5 +1,6 @@
 libitext-java (2.1.3-1) UNRELEASED; urgency=low
 
+  [Adriaan Peeters]
   * New upstream release (Closes: #447359)
   * Removed patches:
     - debian/patches/01_jpeg_encoder_classpath.patch
@@ -22,8 +23,11 @@
   * Bumped debian/compat from 4 to 5
   * Added debian/watch
 
- -- Adriaan Peeters <apeeters at lashout.net>  Thu, 05 Jun 2008 19:50:55 +0200
+  [Matthias Klose]
+  * (Build-)depend on default-jre/-jdk.
 
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 17:39:25 +0000
+
 libitext-java (1.4.5-3) unstable; urgency=low
 
   * Build-Depend on ecj instead of ecj-bootstrap. Closes: #442958.

Modified: trunk/libitext-java/debian/control
===================================================================
--- trunk/libitext-java/debian/control	2008-07-30 17:38:32 UTC (rev 6792)
+++ trunk/libitext-java/debian/control	2008-07-30 17:46:43 UTC (rev 6793)
@@ -4,13 +4,13 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Gerardo Curiel <gcuriel at debianvenezuela.org>, Michael Koch <konqueror at gmx.de>, Adriaan Peeters <apeeters at lashout.net>
 Homepage: http://www.lowagie.com/iText/
-Build-Depends: debhelper (>= 5.0.0), cdbs, java-gcj-compat-dev, ant
+Build-Depends: debhelper (>= 5.0.0), cdbs, default-jdk, ant
 Standards-Version: 3.8.0
 
 Package: libitext-java
 Architecture: all
 Section: libs
-Depends:  java-gcj-compat (>= 1.0.65) | java2-runtime
+Depends:  default-jre | java2-runtime
 Description: Java Library to create and manipulate PDF on the fly
  iText is a library that allows you to generate PDF files on the fly.
  The iText classes are very useful for people who need to generate read-only,
@@ -22,7 +22,7 @@
 Package: libitext-rtf-java
 Architecture: all
 Section: libs
-Depends:  java-gcj-compat (>= 1.0.65) | java2-runtime, libitext-java (= ${binary:Version})
+Depends:  default-jre | java2-runtime, libitext-java (= ${binary:Version})
 Description: Java Library to create and manipulate RTF files on the fly
  iText RTF is a library that allows you to generate RTF files on the fly in
  a similar fashion to iText itself.
@@ -30,7 +30,7 @@
 Package: libitext-rups-java
 Architecture: all
 Section: libs
-Depends:  java-gcj-compat (>= 1.0.65) | java2-runtime, java-virtual-machine, libitext-java (= ${binary:Version})
+Depends:  default-jre | java2-runtime, java-virtual-machine, libitext-java (= ${binary:Version})
 Description: graphical tool for Reading and Updating PDF Syntax (RUPS)
  iText RUPS provides a GUI for visualizing PDF files and investigating their
  internal structure.

Modified: trunk/libitext-java/debian/rules
===================================================================
--- trunk/libitext-java/debian/rules	2008-07-30 17:38:32 UTC (rev 6792)
+++ trunk/libitext-java/debian/rules	2008-07-30 17:46:43 UTC (rev 6793)
@@ -4,9 +4,8 @@
 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             := servlet-2.3.jar ant-optional ecj $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_BUILD_TARGET := jar jar.rtf jar.rups
 DEB_ANT_CLEAN_TARGET :=
 DEB_ANT_BUILDFILE    := src/build.xml