[cdk] 40/62: * Added debian/patches/20-Java5.patch to work with JavaCC 5.0. * (Build-)Depends on default-jdk. * Put package into section 'java'.

[Emmanuel Bourg]

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

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

commit 67b71baa83ce9caa679b58686b3e5bd52726c4b6
Author: Michael Koch <konqueror at gmx.de>
Date:   Thu Sep 24 18:02:51 2009 +0000

    * Added debian/patches/20-Java5.patch to work with JavaCC 5.0.
    * (Build-)Depends on default-jdk.
    * Put package into section 'java'.
---
 debian/changelog | 7 +++++--
 debian/compat    | 2 +-
 debian/control   | 9 ++++-----
 debian/rules     | 3 +--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aee072b..aaf4af3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-cdk (1:1.0.2-3) UNRELEASED; urgency=low
+cdk (1:1.0.2-3) unstable; urgency=low
 
   * Build-Depends on libjgrapht0.6-java (Closes: #517348).
+  * Added debian/patches/20-Java5.patch to work with JavaCC 5.0.
+  * (Build-)Depends on default-jdk.
+  * Put package into section 'java'.
   * Build-Depends on debhelper >= 7.
   * Updated Standards-Version to 3.8.3.
 
- -- Michael Koch <konqueror at gmx.de>  Tue, 22 Sep 2009 23:49:11 +0200
+ -- Michael Koch <konqueror at gmx.de>  Thu, 24 Sep 2009 19:57:42 +0200
 
 cdk (1:1.0.2-2) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+5
diff --git a/debian/control b/debian/control
index 4590c16..bb2c544 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,18 @@
 Source: cdk
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>, Michael Koch <konqueror at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>
-Build-Depends: cdbs, debhelper (>= 7)
-Build-Depends-Indep: ant-optional, antlr, docbook-xsl (>= 1.66.1), javacc, java-gcj-compat-dev, libcommons-cli-java, libcrimson-java, libjdom0-java, liblog4j1.2-java, libmysql-java, libpgjava, libxerces2-java, xsltproc, libjgrapht0.6-java, libvecmath1.2-java, libxom-java, libjama-java
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant-optional
+Build-Depends-Indep: antlr, docbook-xsl (>= 1.66.1), javacc, libcommons-cli-java, libcrimson-java, libjdom0-java, liblog4j1.2-java, libmysql-java, libpgjava, libxerces2-java, xsltproc, libjgrapht-java, libvecmath1.2-java, libxom-java, libjama-java
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cdk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cdk
 Homepage: http://cdk.sourceforge.net/
 
 Package: libcdk-java
-Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime | java2-runtime, ${misc:Depends}
 Suggests: jchempaint, jmol
 Description: Chemistry Development Kit (CDK) Java libraries
  The CDK is a library of Java classes used in computational and
diff --git a/debian/rules b/debian/rules
index 5d3134b..519b860 100644
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,7 @@ 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
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/default-java
 DEB_JARS := \
 	ant-nodeps \
 	javacc \

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