[libitext-java] 35/76: * (Build-)depend on default-jre/-jdk.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libitext-java.

commit 6f20cbcac5a31544b5a9ccc5e9fdd08136a9b6fa
Author: Matthias Klose <doko at debian.org>
Date:   Wed Jul 30 17:46:43 2008 +0000

    * (Build-)depend on default-jre/-jdk.
---
 debian/changelog | 6 +++++-
 debian/control   | 8 ++++----
 debian/rules     | 3 +--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2115b5..daaebe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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,7 +23,10 @@ libitext-java (2.1.3-1) UNRELEASED; urgency=low
   * 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
 
diff --git a/debian/control b/debian/control
index 3826a8e..7de05da 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Priority: optional
 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 @@ Description: Java Library to create and manipulate PDF on the fly
 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 @@ Description: Java Library to create and manipulate RTF files on the fly
 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.
diff --git a/debian/rules b/debian/rules
index 98d7fee..caa3e03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libitext-java.git