[pkg-java] r13736 - in trunk/cdk/debian: . patches
Onkar Shinde
onkarshinde-guest at alioth.debian.org
Wed Jun 1 06:23:46 UTC 2011
Author: onkarshinde-guest
Date: 2011-06-01 06:23:46 +0000 (Wed, 01 Jun 2011)
New Revision: 13736
Removed:
trunk/cdk/debian/patches/21_vecmath_lib_name.patch
Modified:
trunk/cdk/debian/changelog
trunk/cdk/debian/control
trunk/cdk/debian/patches/22_fix_build.patch
trunk/cdk/debian/patches/series
trunk/cdk/debian/rules
Log:
cdk 1.2.10-1
Modified: trunk/cdk/debian/changelog
===================================================================
--- trunk/cdk/debian/changelog 2011-06-01 06:07:30 UTC (rev 13735)
+++ trunk/cdk/debian/changelog 2011-06-01 06:23:46 UTC (rev 13736)
@@ -1,3 +1,25 @@
+cdk (1:1.2.10-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #627582, #627712)
+ * debian/control
+ - Drop bunch of not used build dependencies - libcommons-cli-java,
+ libcrimson-java, libmysql-java, libpgjava, xsltproc.
+ - Add javahelper as build dependency to use jh_classpath and jh_depends
+ utilities.
+ * debian/rules
+ - Include javahelper.mk
+ - Remove ant-nodeps, vecmath, log4j-1.2, commons-cli from build classpath.
+ Build classpath is managed by upstream build system.
+ - Remove modules which do not contain any class files when built - inchi,
+ pdbcml, qsarxml.
+ - Add logic to generate debian/classpath file. This file is used by
+ jh_classpath to update classpath in manifest files. (Closes: #627683)
+ * debian/patches/
+ - 21_vecmath_lib_name.patch - Remove. Not needed anymore.
+ - 22_fix_build.patch - Update as per current upstream source.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Mon, 30 May 2011 20:50:41 +0530
+
cdk (1:1.2.8-1) unstable; urgency=low
* New upstream release.
Modified: trunk/cdk/debian/control
===================================================================
--- trunk/cdk/debian/control 2011-06-01 06:07:30 UTC (rev 13735)
+++ trunk/cdk/debian/control 2011-06-01 06:23:46 UTC (rev 13736)
@@ -3,16 +3,16 @@
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>, Onkar Shinde <onkarshinde at ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant-optional
-Build-Depends-Indep: ant-contrib, antlr, docbook-xsl (>= 1.66.1), javacc, libcommons-cli-java, libcrimson-java, liblog4j1.2-java, libmysql-java, libpgjava, libxerces2-java, xsltproc, libjgrapht0.6-java-link, libvecmath-java, libxom-java, libjama-java, libxpp3-java, r-cran-rjava
-Standards-Version: 3.9.1
+Build-Depends: cdbs, debhelper (>= 7), javahelper, default-jdk, ant-optional
+Build-Depends-Indep: ant-contrib, antlr, docbook-xsl (>= 1.66.1), javacc, liblog4j1.2-java, libxerces2-java, libjgrapht0.6-java-link, libvecmath-java, libxom-java, libjama-java, libxpp3-java, r-cran-rjava
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cdk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cdk/#_trunk_cdk_
Homepage: http://cdk.sourceforge.net/
Package: libcdk-java
Architecture: all
-Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends}
+Depends: ${misc:Depends}, ${java:Depends}
Suggests: jchempaint, jmol
Description: Chemistry Development Kit (CDK) Java libraries
The CDK is a library of Java classes used in computational and
Deleted: trunk/cdk/debian/patches/21_vecmath_lib_name.patch
===================================================================
--- trunk/cdk/debian/patches/21_vecmath_lib_name.patch 2011-06-01 06:07:30 UTC (rev 13735)
+++ trunk/cdk/debian/patches/21_vecmath_lib_name.patch 2011-06-01 06:23:46 UTC (rev 13736)
@@ -1,522 +0,0 @@
-Description: Change vecmath1.2.jar references to vecmath*.jar to fix the build.
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3294458&group_id=20024&atid=320024
-Author: Onkar Shinde <onshinde at ubuntu.com>
---- a/build.xml 2011-04-19 09:35:32.000000000 +0530
-+++ b/build.xml 2011-04-19 09:36:00.000000000 +0530
-@@ -131,7 +131,7 @@
-
- <!-- test for optional jars -->
- <available property="vecmath.present"
-- file="${lib}/vecmath1.2-1.14.jar"/>
-+ file="${lib}/vecmath.jar"/>
- <available property="log4j.present"
- file="${lib}/log4j.jar"/>
- <available property="jgrapht.present"
-@@ -1158,7 +1158,7 @@
- <classpath>
- <pathelement location="jar/jgrapht-0.6.0.jar"/>
- <pathelement location="jar/xercesImpl-2.9.0.jar"/>
-- <pathelement location="jar/vecmath1.2-1.14.jar"/>
-+ <pathelement location="jar/vecmath.jar"/>
- <pathelement path="${dist}/jar/cdk-builder3dtools.jar" />
- <pathelement path="${dist}/jar/cdk-interfaces.jar" />
- <pathelement path="${dist}/jar/cdk-nonotify.jar" />
---- a/src/META-INF/builder3d.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/builder3d.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1,3 +1,3 @@
- jama-1.0.2.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
-
---- a/src/META-INF/builder3dtools.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/builder3dtools.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
-
---- a/src/META-INF/charges.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/charges.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1,3 +1,3 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- jgrapht-0.6.0.jar
-
---- a/src/META-INF/control.libdepends 2011-04-19 09:35:37.000000000 +0530
-+++ b/src/META-INF/control.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
-
---- a/src/META-INF/datadebug.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/datadebug.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/data.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/data.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/extra.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/extra.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,3 +1,3 @@
- jama-1.0.2.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/forcefield.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/forcefield.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1,3 +1,3 @@
- jama-1.0.2.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
-
---- a/src/META-INF/inchi.libdepends 2011-04-19 09:35:37.000000000 +0530
-+++ b/src/META-INF/inchi.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
- jniinchi-0.5.jar
- cmlxom-2.5-b1.jar
---- a/src/META-INF/interfaces.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/interfaces.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/io.libdepends 2011-04-19 09:35:37.000000000 +0530
-+++ b/src/META-INF/io.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xpp3-1.1.4c.jar
---- a/src/META-INF/nonotify.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/nonotify.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/pdb.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/pdb.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
-
---- a/src/META-INF/qsar.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/qsar.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -2,5 +2,5 @@
- JRI.jar
- jgrapht-0.6.0.jar
- sjava-0.68.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/reaction.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/reaction.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,5 +1,5 @@
- log4j.jar
- jgrapht-0.6.0.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
-
---- a/src/META-INF/render.libdepends 2011-04-19 09:35:32.000000000 +0530
-+++ b/src/META-INF/render.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
-
---- a/src/META-INF/sdg.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/sdg.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
-
---- a/src/META-INF/smiles.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/smiles.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/standard.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/standard.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,3 +1,3 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-builder3d.libdepends 2011-04-19 09:35:37.000000000 +0530
-+++ b/src/META-INF/test-builder3d.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -1,4 +1,4 @@
- jama-1.0.2.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-core.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/test-core.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -1,3 +1,3 @@
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-datadebug.libdepends 2011-04-19 09:35:32.000000000 +0530
-+++ b/src/META-INF/test-datadebug.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,2 +1,2 @@
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/test-data.libdepends 2011-04-19 09:35:32.000000000 +0530
-+++ b/src/META-INF/test-data.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,2 +1,2 @@
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/test-extra.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/test-extra.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -3,5 +3,5 @@
- cmlxom-2.5-b1.jar
- log4j.jar
- sjava-0.68.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/test-forcefield.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/test-forcefield.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,4 +1,4 @@
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/test-inchi.libdepends 2011-04-19 09:35:32.000000000 +0530
-+++ b/src/META-INF/test-inchi.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
- jniinchi-0.5.jar
- cmlxom-2.5-b1.jar
---- a/src/META-INF/test-io.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/test-io.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -1,6 +1,6 @@
- jgrapht-0.6.0.jar
- cmlxom-2.5-b1.jar
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
- xpp3-1.1.4c.jar
---- a/src/META-INF/test.libdepends 2011-04-19 09:35:32.000000000 +0530
-+++ b/src/META-INF/test.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
---- a/src/META-INF/test-libiomd.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/test-libiomd.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- cmlxom-2.5-b1.jar
- xom-1.1.jar
---- a/src/META-INF/test-nonotify.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/test-nonotify.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -1,2 +1,2 @@
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/test-pdb.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/test-pdb.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
-
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/test-qsar.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/test-qsar.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-reaction.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/test-reaction.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,5 +1,5 @@
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/test-smiles.libdepends 2011-04-19 09:35:37.000000000 +0530
-+++ b/src/META-INF/test-smiles.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -1,5 +1,5 @@
- jgrapht-0.6.0.jar
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
- cmlxom-2.5-b1.jar
---- a/src/META-INF/test-standard.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/test-standard.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -1,5 +1,5 @@
- log4j.jar
- jgrapht-0.6.0.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- cmlxom-2.5-b1.jar
- xom-1.1.jar
---- a/src/META-INF/test-structgen.libdepends 2011-04-19 09:35:32.000000000 +0530
-+++ b/src/META-INF/test-structgen.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,3 +1,3 @@
- log4j.jar
- jgrapht-0.6.0.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/test-valencycheck.libdepends 2011-04-19 09:35:32.000000000 +0530
-+++ b/src/META-INF/test-valencycheck.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,3 +1,3 @@
- jgrapht-0.6.0.jar
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/valencycheck.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/valencycheck.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/diff.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/diff.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/fingerprint.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/fingerprint.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/formula.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/formula.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
-
---- a/src/META-INF/isomorphism.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/isomorphism.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -1,3 +1,3 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/libiocml.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/libiocml.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
- cmlxom-2.5-b1.jar
-
---- a/src/META-INF/pcore.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/pcore.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/qm.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/qm.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/qsaratomic.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/qsaratomic.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -2,5 +2,5 @@
- JRI.jar
- jgrapht-0.6.0.jar
- sjava-0.68.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/qsarbond.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/qsarbond.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -2,5 +2,5 @@
- JRI.jar
- jgrapht-0.6.0.jar
- sjava-0.68.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/qsarmolecular.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/qsarmolecular.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -2,5 +2,5 @@
- JRI.jar
- jgrapht-0.6.0.jar
- sjava-0.68.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/qsarprotein.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/qsarprotein.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -2,5 +2,5 @@
- JRI.jar
- jgrapht-0.6.0.jar
- sjava-0.68.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/smarts.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/smarts.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/test-atomtype.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/test-atomtype.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,3 +1,3 @@
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-charges.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/test-charges.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -1,3 +1,3 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-diff.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/test-diff.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
---- a/src/META-INF/test-fingerprint.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/test-fingerprint.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,3 +1,3 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- jgrapht-0.6.0.jar
- log4j.jar
---- a/src/META-INF/test-formula.libdepends 2011-04-19 09:35:32.000000000 +0530
-+++ b/src/META-INF/test-formula.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,5 +1,5 @@
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/test-interfaces.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/test-interfaces.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -1,2 +1,2 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
---- a/src/META-INF/test-ioformats.libdepends 2011-04-19 09:35:36.000000000 +0530
-+++ b/src/META-INF/test-ioformats.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -1,6 +1,6 @@
- jgrapht-0.6.0.jar
- cmlxom-2.5-b1.jar
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
- xpp3-1.1.4c.jar
---- a/src/META-INF/test-ionpot.libdepends 2011-04-19 09:35:32.000000000 +0530
-+++ b/src/META-INF/test-ionpot.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,5 +1,5 @@
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/test-isomorphism.libdepends 2011-04-19 09:35:33.000000000 +0530
-+++ b/src/META-INF/test-isomorphism.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,3 +1,3 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-libiocml.libdepends 2011-04-19 09:35:37.000000000 +0530
-+++ b/src/META-INF/test-libiocml.libdepends 2011-04-19 09:36:05.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- cmlxom-2.5-b1.jar
- xom-1.1.jar
---- a/src/META-INF/test-pcore.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/test-pcore.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,4 +1,4 @@
- jgrapht-0.6.0.jar
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- xom-1.1.jar
---- a/src/META-INF/test-qm.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/test-qm.libdepends 2011-04-19 09:35:46.000000000 +0530
-@@ -1 +1 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/test-qsaratomic.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/test-qsaratomic.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-qsarbond.libdepends 2011-04-19 09:35:32.000000000 +0530
-+++ b/src/META-INF/test-qsarbond.libdepends 2011-04-19 09:36:01.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-qsarionpot.libdepends 2011-04-19 09:35:37.000000000 +0530
-+++ b/src/META-INF/test-qsarionpot.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-qsarmolecular.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/test-qsarmolecular.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-qsarprotein.libdepends 2011-04-19 09:35:35.000000000 +0530
-+++ b/src/META-INF/test-qsarprotein.libdepends 2011-04-19 09:36:03.000000000 +0530
-@@ -1,4 +1,4 @@
--vecmath1.2-1.14.jar
-+vecmath*.jar
- log4j.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-render.libdepends 2011-04-19 09:35:37.000000000 +0530
-+++ b/src/META-INF/test-render.libdepends 2011-04-19 09:36:05.000000000 +0530
-@@ -1,2 +1,2 @@
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
---- a/src/META-INF/test-sdg.libdepends 2011-04-19 09:35:37.000000000 +0530
-+++ b/src/META-INF/test-sdg.libdepends 2011-04-19 09:36:04.000000000 +0530
-@@ -1,3 +1,3 @@
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-smarts.libdepends 2011-04-19 09:35:34.000000000 +0530
-+++ b/src/META-INF/test-smarts.libdepends 2011-04-19 09:36:02.000000000 +0530
-@@ -1,3 +1,3 @@
- jgrapht-0.6.0.jar
- log4j.jar
--vecmath1.2-1.14.jar
-+vecmath*.jar
Modified: trunk/cdk/debian/patches/22_fix_build.patch
===================================================================
--- trunk/cdk/debian/patches/22_fix_build.patch 2011-06-01 06:07:30 UTC (rev 13735)
+++ trunk/cdk/debian/patches/22_fix_build.patch 2011-06-01 06:23:46 UTC (rev 13736)
@@ -1,11 +1,10 @@
Description: Disable components which fail to build because of yet unpackaged
build dependencies. Also change references to certain build dependencies as
per names in system.
- Note: Only the changes which are relevant upstream have been forwarded.
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3294458&group_id=20024&atid=320024
+Forwarded: not-needed
Author: Onkar Shinde <onshinde at ubuntu.com>
---- a/build.xml 2011-04-20 20:24:09.000000000 +0530
-+++ b/build.xml 2011-04-20 20:24:35.000000000 +0530
+--- a/build.xml 2011-05-28 16:48:03.000000000 +0530
++++ b/build.xml 2011-05-31 00:24:54.000000000 +0530
@@ -39,7 +39,7 @@
<!-- Include the ant-contrib goodies -->
<taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -15,9 +14,12 @@
</classpath>
</taskdef>
-@@ -133,7 +133,7 @@
+@@ -131,9 +131,9 @@
+
+ <!-- test for optional jars -->
<available property="vecmath.present"
- file="${lib}/vecmath.jar"/>
+- file="${lib}/vecmath1.2-1.14.jar"/>
++ file="${lib}/vecmath.jar"/>
<available property="log4j.present"
- file="${lib}/log4j.jar"/>
+ file="${lib}/log4j-1.2.jar"/>
@@ -60,452 +62,3 @@
<replace dir="${src}/main/org/openscience/cdk/smiles/smarts/parser"
excludes="AST*.java,SMARTSParser.jjt,SMARTSParser.jj,*Node.java"
token="package org.openscience.cdk.smiles.smarts.parser;" summary="true" >
---- a/src/META-INF/atomtype.libdepends 2011-04-20 20:23:11.000000000 +0530
-+++ b/src/META-INF/atomtype.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1 +1 @@
--log4j.jar
-+log4j*.jar
---- a/src/META-INF/core.libdepends 2011-04-20 20:23:09.000000000 +0530
-+++ b/src/META-INF/core.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1 +1 @@
--log4j.jar
-+log4j*.jar
---- a/src/META-INF/isomorphism.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/isomorphism.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/reaction.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/reaction.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,5 +1,5 @@
--log4j.jar
-+log4j*.jar
- jgrapht-0.6.0.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
-
---- a/src/META-INF/standard.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/standard.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-atomtype.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-atomtype.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
--log4j.jar
-+log4j*.jar
- vecmath*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-builder3d.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-builder3d.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,4 +1,4 @@
- jama-1.0.2.jar
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-charges.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-charges.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-core.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-core.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
--log4j.jar
-+log4j*.jar
- vecmath*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-data.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-data.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
--log4j.jar
-+log4j*.jar
- vecmath*.jar
---- a/src/META-INF/test-datadebug.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-datadebug.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
--log4j.jar
-+log4j*.jar
- vecmath*.jar
---- a/src/META-INF/test-diff.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-diff.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
---- a/src/META-INF/test-extra.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-extra.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,7 +1,7 @@
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
- cmlxom-2.5-b1.jar
--log4j.jar
-+log4j*.jar
- sjava-0.68.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/test-fingerprint.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-fingerprint.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
- vecmath*.jar
- jgrapht-0.6.0.jar
--log4j.jar
-+log4j*.jar
---- a/src/META-INF/test-forcefield.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-forcefield.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,4 +1,4 @@
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
--log4j.jar
-+log4j*.jar
- vecmath*.jar
---- a/src/META-INF/test-formula.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-formula.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,5 +1,5 @@
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
--log4j.jar
-+log4j*.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/test-inchi.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-inchi.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,5 +1,5 @@
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
- jniinchi-0.5.jar
- cmlxom-2.5-b1.jar
--log4j.jar
-+log4j*.jar
---- a/src/META-INF/test-interfaces.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-interfaces.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
---- a/src/META-INF/test-io.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-io.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,6 +1,6 @@
- jgrapht-0.6.0.jar
- cmlxom-2.5-b1.jar
--log4j.jar
-+log4j*.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
- xpp3-1.1.4c.jar
---- a/src/META-INF/test-ioformats.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-ioformats.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,6 +1,6 @@
- jgrapht-0.6.0.jar
- cmlxom-2.5-b1.jar
--log4j.jar
-+log4j*.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
- xpp3-1.1.4c.jar
---- a/src/META-INF/test-ionpot.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-ionpot.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,5 +1,5 @@
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
--log4j.jar
-+log4j*.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/test-isomorphism.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-isomorphism.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-libiocml.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-libiocml.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,5 +1,5 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- cmlxom-2.5-b1.jar
--xom-1.1.jar
-+xom*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-libiomd.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-libiomd.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,4 +1,4 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- cmlxom-2.5-b1.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/test-nonotify.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-nonotify.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
--log4j.jar
-+log4j*.jar
- vecmath*.jar
---- a/src/META-INF/test-pcore.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-pcore.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,4 +1,4 @@
- jgrapht-0.6.0.jar
--log4j.jar
-+log4j*.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/test-pdb.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-pdb.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,4 +1,4 @@
- vecmath*.jar
-
--log4j.jar
-+log4j*.jar
- vecmath*.jar
---- a/src/META-INF/test-qsar.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-qsar.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,7 +1,7 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
--xom-1.1.jar
-+xom*.jar
- JRI.jar
- sjava-0.68.jar
---- a/src/META-INF/test-qsaratomic.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-qsaratomic.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,7 +1,7 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
--xom-1.1.jar
-+xom*.jar
- JRI.jar
- sjava-0.68.jar
---- a/src/META-INF/test-qsarbond.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-qsarbond.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,7 +1,7 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
--xom-1.1.jar
-+xom*.jar
- JRI.jar
- sjava-0.68.jar
---- a/src/META-INF/test-qsarionpot.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-qsarionpot.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,7 +1,7 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
--xom-1.1.jar
-+xom*.jar
- JRI.jar
- sjava-0.68.jar
---- a/src/META-INF/test-qsarmolecular.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-qsarmolecular.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,7 +1,7 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
--xom-1.1.jar
-+xom*.jar
- JRI.jar
- sjava-0.68.jar
---- a/src/META-INF/test-qsarprotein.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-qsarprotein.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,7 +1,7 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
--xom-1.1.jar
-+xom*.jar
- JRI.jar
- sjava-0.68.jar
---- a/src/META-INF/test-reaction.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-reaction.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,5 +1,5 @@
- jama-1.0.2.jar
- jgrapht-0.6.0.jar
--log4j.jar
-+log4j*.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/test-render.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-render.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
--log4j.jar
-+log4j*.jar
- vecmath*.jar
---- a/src/META-INF/test-sdg.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-sdg.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
--log4j.jar
-+log4j*.jar
- vecmath*.jar
- jgrapht-0.6.0.jar
---- a/src/META-INF/test-smarts.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-smarts.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
- jgrapht-0.6.0.jar
--log4j.jar
-+log4j*.jar
- vecmath*.jar
---- a/src/META-INF/test-smiles.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-smiles.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,5 +1,5 @@
- jgrapht-0.6.0.jar
--log4j.jar
-+log4j*.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
- cmlxom-2.5-b1.jar
---- a/src/META-INF/test-standard.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-standard.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,5 +1,5 @@
--log4j.jar
-+log4j*.jar
- jgrapht-0.6.0.jar
- vecmath*.jar
- cmlxom-2.5-b1.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/test-structgen.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-structgen.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
--log4j.jar
-+log4j*.jar
- jgrapht-0.6.0.jar
- vecmath*.jar
---- a/src/META-INF/test-valencycheck.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test-valencycheck.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
- jgrapht-0.6.0.jar
--log4j.jar
-+log4j*.jar
- vecmath*.jar
---- a/src/META-INF/test.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/test.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
- vecmath*.jar
--log4j.jar
-+log4j*.jar
---- a/src/META-INF/dict.libdepends 2011-04-20 20:23:11.000000000 +0530
-+++ b/src/META-INF/dict.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1 +1 @@
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/extra.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/extra.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,3 +1,3 @@
- jama-1.0.2.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/inchi.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/inchi.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,4 +1,4 @@
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
- jniinchi-0.5.jar
- cmlxom-2.5-b1.jar
---- a/src/META-INF/libiocml.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/libiocml.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,4 +1,4 @@
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
- cmlxom-2.5-b1.jar
-
---- a/src/META-INF/libiomd.libdepends 2011-04-20 20:23:09.000000000 +0530
-+++ b/src/META-INF/libiomd.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
- cmlxom-2.5-b1.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/pcore.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/pcore.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/pdbcml.libdepends 2011-04-20 20:23:10.000000000 +0530
-+++ b/src/META-INF/pdbcml.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
--xom-1.1.jar
-+xom*.jar
- cmlxom-2.5-b1.jar
---- a/src/META-INF/qsar.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/qsar.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -3,4 +3,4 @@
- jgrapht-0.6.0.jar
- sjava-0.68.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/qsaratomic.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/qsaratomic.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -3,4 +3,4 @@
- jgrapht-0.6.0.jar
- sjava-0.68.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/qsarbond.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/qsarbond.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -3,4 +3,4 @@
- jgrapht-0.6.0.jar
- sjava-0.68.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/qsarcml.libdepends 2011-04-20 20:23:12.000000000 +0530
-+++ b/src/META-INF/qsarcml.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -1,2 +1,2 @@
--xom-1.1.jar
-+xom*.jar
- cmlxom-2.5-b1.jar
---- a/src/META-INF/qsarmolecular.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/qsarmolecular.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -3,4 +3,4 @@
- jgrapht-0.6.0.jar
- sjava-0.68.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
---- a/src/META-INF/qsarprotein.libdepends 2011-04-20 20:24:09.000000000 +0530
-+++ b/src/META-INF/qsarprotein.libdepends 2011-04-20 20:24:09.000000000 +0530
-@@ -3,4 +3,4 @@
- jgrapht-0.6.0.jar
- sjava-0.68.jar
- vecmath*.jar
--xom-1.1.jar
-+xom*.jar
Modified: trunk/cdk/debian/patches/series
===================================================================
--- trunk/cdk/debian/patches/series 2011-06-01 06:07:30 UTC (rev 13735)
+++ trunk/cdk/debian/patches/series 2011-06-01 06:23:46 UTC (rev 13736)
@@ -1,2 +1 @@
-21_vecmath_lib_name.patch
22_fix_build.patch
Modified: trunk/cdk/debian/rules
===================================================================
--- trunk/cdk/debian/rules 2011-06-01 06:07:30 UTC (rev 13735)
+++ trunk/cdk/debian/rules 2011-06-01 06:23:46 UTC (rev 13736)
@@ -1,16 +1,13 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := \
ant-contrib \
- ant-nodeps \
- javacc \
- vecmath \
- log4j-1.2 \
- commons-cli
+ javacc
ANT_ARGS := -Dlib=/usr/share/java
@@ -31,7 +28,6 @@
fingerprint \
forcefield \
formula \
- inchi \
interfaces \
ioformats \
io \
@@ -41,13 +37,11 @@
libiomd \
nonotify \
pcore \
- pdbcml \
pdb \
qm \
qsar \
qsaratomic \
qsarbond \
- qsarcml \
qsarionpot \
qsarmolecular \
qsarprotein \
@@ -70,4 +64,9 @@
debian/libcdk-java/usr/share/java/cdk-$$COMPONENT-$(DEB_UPSTREAM_VERSION).jar; \
ln -s cdk-$$COMPONENT-$(DEB_UPSTREAM_VERSION).jar \
debian/libcdk-java/usr/share/java/cdk-$$COMPONENT.jar; \
+ if [ $$COMPONENT != "core" ]; then \
+ echo usr/share/java/cdk-$$COMPONENT.jar cdk-core.jar >> debian/classpath; \
+ else \
+ echo usr/share/java/cdk-$$COMPONENT.jar jama.jar jgrapht.jar log4j-1.2.jar xercesImpl.jar vecmath.jar xom.jar >> debian/classpath; \
+ fi \
done
More information about the pkg-java-commits
mailing list