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

[Egon Willighagen]

Author: egonw-guest
Date: 2007-02-09 17:55:20 +0100 (Fri, 09 Feb 2007)
New Revision: 2995

Modified:
   trunk/cdk/debian/TODO
   trunk/cdk/debian/changelog
   trunk/cdk/debian/control
   trunk/cdk/debian/rules
Log:
Make some progress, but stuck right now, with a JAVACC_HOME not defined problem (see TODO).


Modified: trunk/cdk/debian/TODO
===================================================================
--- trunk/cdk/debian/TODO	2007-02-08 17:51:36 UTC (rev 2994)
+++ trunk/cdk/debian/TODO	2007-02-09 16:55:20 UTC (rev 2995)
@@ -1,8 +1,31 @@
 TODO list for cdk in Debian
 
-* Patch the build.xml so that the JavaDoc taglets Make*FilesTaglet in doc/javadoc/source compile with gjdoc
-
 * Make a binary package for JChemPaint, see the build-jchempaint.xml
 
-* Complete dependencies and remove optional library dependencies from contrib, such as batik
+* Fix the JavaCC not set problem:
 
+javacc:
+     [echo] Compiling Ant 1.6 depending classes.
+  [antcall] Exiting /tmp/buildd/cdk-0.99.1/build.xml.
+
+BUILD FAILED
+/tmp/buildd/cdk-0.99.1/build.xml:429: The following error occurred while executing this line:
+/tmp/buildd/cdk-0.99.1/build.xml:382: JavaCC home must be a valid directory.
+   at org.apache.tools.ant.ProjectHelper.addLocationToBuildException (ProjectHelper.java:539)
+   at org.apache.tools.ant.taskdefs.Ant.execute (Ant.java:385)
+   at org.apache.tools.ant.taskdefs.CallTarget.execute (CallTarget.java:107)
+   at org.apache.tools.ant.UnknownElement.execute (UnknownElement.java:275)
+   at org.apache.tools.ant.Task.perform (Task.java:364)
+   at org.apache.tools.ant.Target.execute (Target.java:341)
+   at org.apache.tools.ant.Target.performTasks (Target.java:369)
+   at org.apache.tools.ant.Project.executeSortedTargets (Project.java:1216)
+   at org.apache.tools.ant.Project.executeTarget (Project.java:1185)
+   at org.apache.tools.ant.helper.DefaultExecutor.executeTargets (DefaultExecutor.java:40)
+   at org.apache.tools.ant.Project.executeTargets (Project.java:1068)
+   at org.apache.tools.ant.Main.runBuild (Main.java:668)
+   at org.apache.tools.ant.Main.startAnt (Main.java:187)
+   at org.apache.tools.ant.Main.start (Main.java:150)
+   at org.apache.tools.ant.Main.main (Main.java:240)
+
+* Figure out how to easily rename jar names in src/META-INF/*.libdepends to match /usr/share/java
+

Modified: trunk/cdk/debian/changelog
===================================================================
--- trunk/cdk/debian/changelog	2007-02-08 17:51:36 UTC (rev 2994)
+++ trunk/cdk/debian/changelog	2007-02-09 16:55:20 UTC (rev 2995)
@@ -1,3 +1,9 @@
+cdk (1:0.99.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Egon Willighagen <egonw at localhost>  Fri,  9 Feb 2007 16:54:47 +0100
+
 cdk (20060211-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/cdk/debian/control
===================================================================
--- trunk/cdk/debian/control	2007-02-08 17:51:36 UTC (rev 2994)
+++ trunk/cdk/debian/control	2007-02-09 16:55:20 UTC (rev 2995)
@@ -2,7 +2,7 @@
 Section: contrib/libs
 Priority: optional
 Maintainer: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends-Indep: debhelper (>= 4.0.0), ant (>= 1.6), antlr, docbook-xsl (>= 1.66.1), javacc, kaffe | java2-compiler, libcommons-cli-java, libcrimson-java, libjdom0-java, liblog4j1.2-java, libmysql-java, libpgjava, libxerces2-java, xsltproc
+Build-Depends-Indep: cdbs, debhelper (>= 4.0.0), ant (>= 1.6), ant-optional, antlr, docbook-xsl (>= 1.66.1), javacc, kaffe | java2-compiler, libcommons-cli-java, libcrimson-java, libjdom0-java, liblog4j1.2-java, libmysql-java, libpgjava, libxerces2-java, xsltproc
 Standards-Version: 3.6.1.1
 
 Package: cdk

Modified: trunk/cdk/debian/rules
===================================================================
--- trunk/cdk/debian/rules	2007-02-08 17:51:36 UTC (rev 2994)
+++ trunk/cdk/debian/rules	2007-02-09 16:55:20 UTC (rev 2995)
@@ -12,9 +12,6 @@
 	vecmath1.2 \
 	log4j-1.2 \
 	commons-cli \
-	gnu-classpath-tools-gjdoc \
-	com-sun-tools-doclets-Taglet \
-	com-sun-javadoc \
 	ecj
 
 #DEB_ANT_COMPILER     := jikes
@@ -22,23 +19,23 @@
 DEB_ANT_BUILD_TARGET := dist-all
 
 # Additional command-line arguments for Ant
-#ANT_ARGS := -verbose
+ANT_ARGS := -verbose -Dbuild.sysclasspath=first 
 
-ANT_ARGS := -Dbuild.sysclasspath=first 
-
 LIBRARY_PACKAGE := cdk
-API_VERSION     := 20060211
+API_VERSION     := 0.99.1
 
 COMPONENTS := \
 	applications \
 	builder3d \
 	core \
+	controller \
 	data \
 	experimental \
 	extra \
 	interfaces \
 	io \
 	libio-cml \
+	layout \
 	pdb-cml \
 	pdb \
 	qsar-cml \
@@ -46,6 +43,7 @@
 	qsar-pdb \
 	render \
 	standard \
+	structgen \
 	swing 
 
 build/$(LIBRARY_PACKAGE)::