[pkg-java] r10567 - trunk/cdk/debian

[Michael Koch]

Author: mkoch
Date: 2009-09-24 18:02:51 +0000 (Thu, 24 Sep 2009)
New Revision: 10567

Modified:
   trunk/cdk/debian/changelog
   trunk/cdk/debian/compat
   trunk/cdk/debian/control
   trunk/cdk/debian/rules
Log:
* Added debian/patches/20-Java5.patch to work with JavaCC 5.0.
* (Build-)Depends on default-jdk.
* Put package into section 'java'.


Modified: trunk/cdk/debian/changelog
===================================================================
--- trunk/cdk/debian/changelog	2009-09-24 16:15:23 UTC (rev 10566)
+++ trunk/cdk/debian/changelog	2009-09-24 18:02:51 UTC (rev 10567)
@@ -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
 

Modified: trunk/cdk/debian/compat
===================================================================
--- trunk/cdk/debian/compat	2009-09-24 16:15:23 UTC (rev 10566)
+++ trunk/cdk/debian/compat	2009-09-24 18:02:51 UTC (rev 10567)
@@ -1 +1 @@
-7
+5

Modified: trunk/cdk/debian/control
===================================================================
--- trunk/cdk/debian/control	2009-09-24 16:15:23 UTC (rev 10566)
+++ trunk/cdk/debian/control	2009-09-24 18:02:51 UTC (rev 10567)
@@ -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

Modified: trunk/cdk/debian/rules
===================================================================
--- trunk/cdk/debian/rules	2009-09-24 16:15:23 UTC (rev 10566)
+++ trunk/cdk/debian/rules	2009-09-24 18:02:51 UTC (rev 10567)
@@ -4,8 +4,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
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/default-java
 DEB_JARS := \
 	ant-nodeps \
 	javacc \