[pkg-java] r13606 - in trunk/cdk/debian: . patches

Onkar Shinde onkarshinde-guest at alioth.debian.org
Thu Apr 28 17:38:41 UTC 2011


Author: onkarshinde-guest
Date: 2011-04-28 17:38:40 +0000 (Thu, 28 Apr 2011)
New Revision: 13606

Modified:
   trunk/cdk/debian/changelog
   trunk/cdk/debian/control
   trunk/cdk/debian/patches/21_vecmath_lib_name.patch
   trunk/cdk/debian/patches/22_fix_build.patch
   trunk/cdk/debian/watch
Log:
Prepared 1.2.8-1 release

Modified: trunk/cdk/debian/changelog
===================================================================
--- trunk/cdk/debian/changelog	2011-04-28 00:44:26 UTC (rev 13605)
+++ trunk/cdk/debian/changelog	2011-04-28 17:38:40 UTC (rev 13606)
@@ -1,3 +1,16 @@
+cdk (1:1.2.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - Fix value of 'Vcs-Browser' to make it useful.
+  * debian/patches
+    - 21_vecmath_lib_name.patch, 22_fix_build.patch - Updated to use wildcards
+      for jar file names. Forwarded relevant bits upstream.
+  * debian/watch
+    - Improved regular expression to watch future stable versions.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Thu, 28 Apr 2011 20:48:38 +0530
+
 cdk (1:1.2.7-1) unstable; urgency=low
 
   * New upstream release. (Closes: #519969)

Modified: trunk/cdk/debian/control
===================================================================
--- trunk/cdk/debian/control	2011-04-28 00:44:26 UTC (rev 13605)
+++ trunk/cdk/debian/control	2011-04-28 17:38:40 UTC (rev 13606)
@@ -7,7 +7,7 @@
 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
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cdk
-Vcs-Browser: http://svn.debian.org/wsvn/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

Modified: trunk/cdk/debian/patches/21_vecmath_lib_name.patch
===================================================================
--- trunk/cdk/debian/patches/21_vecmath_lib_name.patch	2011-04-28 00:44:26 UTC (rev 13605)
+++ trunk/cdk/debian/patches/21_vecmath_lib_name.patch	2011-04-28 17:38:40 UTC (rev 13606)
@@ -1,8 +1,8 @@
-Description: Change vecmath1.2.jar references to vecmath.jar fix the build.
-Forwarded: not-needed
+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-03-27 14:22:10.000000000 +0530
-+++ b/build.xml	2011-03-27 14:23:58.000000000 +0530
+--- 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 -->
@@ -21,502 +21,502 @@
            <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-03-27 14:22:01.000000000 +0530
-+++ b/src/META-INF/builder3d.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  
---- a/src/META-INF/builder3dtools.libdepends	2011-03-27 14:22:03.000000000 +0530
-+++ b/src/META-INF/builder3dtools.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  
---- a/src/META-INF/charges.libdepends	2011-03-27 14:22:03.000000000 +0530
-+++ b/src/META-INF/charges.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  jgrapht-0.6.0.jar
  
---- a/src/META-INF/control.libdepends	2011-03-27 14:22:04.000000000 +0530
-+++ b/src/META-INF/control.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  
---- a/src/META-INF/datadebug.libdepends	2011-03-27 14:22:00.000000000 +0530
-+++ b/src/META-INF/datadebug.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:22:00.000000000 +0530
-+++ b/src/META-INF/data.libdepends	2011-03-27 14:22:23.000000000 +0530
++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-03-27 14:21:59.000000000 +0530
-+++ b/src/META-INF/extra.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/forcefield.libdepends	2011-03-27 14:22:01.000000000 +0530
-+++ b/src/META-INF/forcefield.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  
---- a/src/META-INF/inchi.libdepends	2011-03-27 14:22:04.000000000 +0530
-+++ b/src/META-INF/inchi.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
  jniinchi-0.5.jar
  cmlxom-2.5-b1.jar
---- a/src/META-INF/interfaces.libdepends	2011-03-27 14:22:01.000000000 +0530
-+++ b/src/META-INF/interfaces.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:22:04.000000000 +0530
-+++ b/src/META-INF/io.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  xpp3-1.1.4c.jar
---- a/src/META-INF/nonotify.libdepends	2011-03-27 14:22:01.000000000 +0530
-+++ b/src/META-INF/nonotify.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:21:59.000000000 +0530
-+++ b/src/META-INF/pdb.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  
---- a/src/META-INF/qsar.libdepends	2011-03-27 14:22:01.000000000 +0530
-+++ b/src/META-INF/qsar.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/reaction.libdepends	2011-03-27 14:22:00.000000000 +0530
-+++ b/src/META-INF/reaction.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
  
---- a/src/META-INF/render.libdepends	2011-03-27 14:21:58.000000000 +0530
-+++ b/src/META-INF/render.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  
---- a/src/META-INF/sdg.libdepends	2011-03-27 14:22:02.000000000 +0530
-+++ b/src/META-INF/sdg.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  
---- a/src/META-INF/smiles.libdepends	2011-03-27 14:22:03.000000000 +0530
-+++ b/src/META-INF/smiles.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:22:00.000000000 +0530
-+++ b/src/META-INF/standard.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  log4j.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-builder3d.libdepends	2011-03-27 14:22:04.000000000 +0530
-+++ b/src/META-INF/test-builder3d.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-core.libdepends	2011-03-27 14:22:04.000000000 +0530
-+++ b/src/META-INF/test-core.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-datadebug.libdepends	2011-03-27 14:21:58.000000000 +0530
-+++ b/src/META-INF/test-datadebug.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:21:58.000000000 +0530
-+++ b/src/META-INF/test-data.libdepends	2011-03-27 14:22:23.000000000 +0530
++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-03-27 14:22:04.000000000 +0530
-+++ b/src/META-INF/test-extra.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/test-forcefield.libdepends	2011-03-27 14:21:59.000000000 +0530
-+++ b/src/META-INF/test-forcefield.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:21:58.000000000 +0530
-+++ b/src/META-INF/test-inchi.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  xom-1.1.jar
  jniinchi-0.5.jar
  cmlxom-2.5-b1.jar
---- a/src/META-INF/test-io.libdepends	2011-03-27 14:22:02.000000000 +0530
-+++ b/src/META-INF/test-io.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
  xpp3-1.1.4c.jar
---- a/src/META-INF/test.libdepends	2011-03-27 14:21:58.000000000 +0530
-+++ b/src/META-INF/test.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
---- a/src/META-INF/test-libiomd.libdepends	2011-03-27 14:21:59.000000000 +0530
-+++ b/src/META-INF/test-libiomd.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
  cmlxom-2.5-b1.jar
  xom-1.1.jar
---- a/src/META-INF/test-nonotify.libdepends	2011-03-27 14:22:01.000000000 +0530
-+++ b/src/META-INF/test-nonotify.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:21:59.000000000 +0530
-+++ b/src/META-INF/test-pdb.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  
  log4j.jar
 -vecmath1.2-1.14.jar
-+vecmath.jar
---- a/src/META-INF/test-qsar.libdepends	2011-03-27 14:22:03.000000000 +0530
-+++ b/src/META-INF/test-qsar.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  log4j.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-reaction.libdepends	2011-03-27 14:22:00.000000000 +0530
-+++ b/src/META-INF/test-reaction.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/test-smiles.libdepends	2011-03-27 14:22:04.000000000 +0530
-+++ b/src/META-INF/test-smiles.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
  cmlxom-2.5-b1.jar
---- a/src/META-INF/test-standard.libdepends	2011-03-27 14:22:02.000000000 +0530
-+++ b/src/META-INF/test-standard.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  cmlxom-2.5-b1.jar
  xom-1.1.jar
---- a/src/META-INF/test-structgen.libdepends	2011-03-27 14:21:58.000000000 +0530
-+++ b/src/META-INF/test-structgen.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:21:58.000000000 +0530
-+++ b/src/META-INF/test-valencycheck.libdepends	2011-03-27 14:22:23.000000000 +0530
++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-03-27 14:22:01.000000000 +0530
-+++ b/src/META-INF/valencycheck.libdepends	2011-03-27 14:22:23.000000000 +0530
++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-03-27 14:22:02.000000000 +0530
-+++ b/src/META-INF/diff.libdepends	2011-03-27 14:22:23.000000000 +0530
++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-03-27 14:22:00.000000000 +0530
-+++ b/src/META-INF/fingerprint.libdepends	2011-03-27 14:22:23.000000000 +0530
++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-03-27 14:22:00.000000000 +0530
-+++ b/src/META-INF/formula.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  
---- a/src/META-INF/isomorphism.libdepends	2011-03-27 14:22:02.000000000 +0530
-+++ b/src/META-INF/isomorphism.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/libiocml.libdepends	2011-03-27 14:22:00.000000000 +0530
-+++ b/src/META-INF/libiocml.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
  cmlxom-2.5-b1.jar
  
---- a/src/META-INF/pcore.libdepends	2011-03-27 14:21:59.000000000 +0530
-+++ b/src/META-INF/pcore.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/qm.libdepends	2011-03-27 14:22:03.000000000 +0530
-+++ b/src/META-INF/qm.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:22:01.000000000 +0530
-+++ b/src/META-INF/qsaratomic.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/qsarbond.libdepends	2011-03-27 14:22:03.000000000 +0530
-+++ b/src/META-INF/qsarbond.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/qsarmolecular.libdepends	2011-03-27 14:21:59.000000000 +0530
-+++ b/src/META-INF/qsarmolecular.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/qsarprotein.libdepends	2011-03-27 14:22:03.000000000 +0530
-+++ b/src/META-INF/qsarprotein.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/smarts.libdepends	2011-03-27 14:22:04.000000000 +0530
-+++ b/src/META-INF/smarts.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:21:59.000000000 +0530
-+++ b/src/META-INF/test-atomtype.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-charges.libdepends	2011-03-27 14:22:02.000000000 +0530
-+++ b/src/META-INF/test-charges.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-diff.libdepends	2011-03-27 14:22:03.000000000 +0530
-+++ b/src/META-INF/test-diff.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
---- a/src/META-INF/test-fingerprint.libdepends	2011-03-27 14:21:59.000000000 +0530
-+++ b/src/META-INF/test-fingerprint.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  jgrapht-0.6.0.jar
  log4j.jar
---- a/src/META-INF/test-formula.libdepends	2011-03-27 14:21:58.000000000 +0530
-+++ b/src/META-INF/test-formula.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/test-interfaces.libdepends	2011-03-27 14:22:03.000000000 +0530
-+++ b/src/META-INF/test-interfaces.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
---- a/src/META-INF/test-ioformats.libdepends	2011-03-27 14:22:03.000000000 +0530
-+++ b/src/META-INF/test-ioformats.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
  xpp3-1.1.4c.jar
---- a/src/META-INF/test-ionpot.libdepends	2011-03-27 14:21:58.000000000 +0530
-+++ b/src/META-INF/test-ionpot.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/test-isomorphism.libdepends	2011-03-27 14:21:59.000000000 +0530
-+++ b/src/META-INF/test-isomorphism.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-libiocml.libdepends	2011-03-27 14:22:05.000000000 +0530
-+++ b/src/META-INF/test-libiocml.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
  cmlxom-2.5-b1.jar
  xom-1.1.jar
---- a/src/META-INF/test-pcore.libdepends	2011-03-27 14:22:00.000000000 +0530
-+++ b/src/META-INF/test-pcore.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  xom-1.1.jar
---- a/src/META-INF/test-qm.libdepends	2011-03-27 14:22:01.000000000 +0530
-+++ b/src/META-INF/test-qm.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:22:02.000000000 +0530
-+++ b/src/META-INF/test-qsaratomic.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  log4j.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-qsarbond.libdepends	2011-03-27 14:21:58.000000000 +0530
-+++ b/src/META-INF/test-qsarbond.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-qsarionpot.libdepends	2011-03-27 14:22:04.000000000 +0530
-+++ b/src/META-INF/test-qsarionpot.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-qsarmolecular.libdepends	2011-03-27 14:22:01.000000000 +0530
-+++ b/src/META-INF/test-qsarmolecular.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-qsarprotein.libdepends	2011-03-27 14:22:02.000000000 +0530
-+++ b/src/META-INF/test-qsarprotein.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar
  log4j.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-render.libdepends	2011-03-27 14:22:05.000000000 +0530
-+++ b/src/META-INF/test-render.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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-03-27 14:22:04.000000000 +0530
-+++ b/src/META-INF/test-sdg.libdepends	2011-03-27 14:22:23.000000000 +0530
++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
++vecmath*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-smarts.libdepends	2011-03-27 14:22:00.000000000 +0530
-+++ b/src/META-INF/test-smarts.libdepends	2011-03-27 14:22:23.000000000 +0530
+--- 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
++vecmath*.jar

Modified: trunk/cdk/debian/patches/22_fix_build.patch
===================================================================
--- trunk/cdk/debian/patches/22_fix_build.patch	2011-04-28 00:44:26 UTC (rev 13605)
+++ trunk/cdk/debian/patches/22_fix_build.patch	2011-04-28 17:38:40 UTC (rev 13606)
@@ -1,10 +1,11 @@
 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.
-Forwarded: not-needed
+ 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
 Author: Onkar Shinde <onshinde at ubuntu.com>
---- a/build.xml	2011-04-17 15:36:32.000000000 +0530
-+++ b/build.xml	2011-04-17 15:40:05.000000000 +0530
+--- a/build.xml	2011-04-20 20:24:09.000000000 +0530
++++ b/build.xml	2011-04-20 20:24:35.000000000 +0530
 @@ -39,7 +39,7 @@
      <!-- Include the ant-contrib goodies -->
      <taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -50,472 +51,461 @@
              </javac>
  
          	<!-- create a autogenerated.classes file, if applicable, so that these files can be included in the jar -->
-@@ -405,7 +410,7 @@
-             <!-- and then jar things up into the module jar -->
-             <jar jarfile="${dist}/jar/cdk-${module}.jar">
-                <fileset dir="${build}/${module}">
--                    <includesfile name="${build}/${module}.classes" />
-+                    <include name="**/*.class" />
-                     <includesfile name="${build}/${module}.autogenerated.classes" if="module.autogenerated.present"/>
-                     <excludesfile name="${build}/java1.4+.classes" if="isJava13"/>
-                     <!-- excludesfile name="${build}/java1.4.classes" unless="isJava14"/ -->
-@@ -468,8 +473,8 @@
+@@ -468,8 +473,6 @@
  	 <!-- OK, we now need to do some replacements such as 
  	      adding cdk.module tags and changing access modes
  	  -->
 -	 <replace file="${src}/main/org/openscience/cdk/smiles/smarts/parser/JJTSMARTSParserState.java" 
 -	          token="class JJTSMARTSParserState {" value="public class JJTSMARTSParserState {" />
-+	 <!--replace file="${src}/main/org/openscience/cdk/smiles/smarts/parser/JJTSMARTSParserState.java"
-+	          token="class JJTSMARTSParserState {" value="public class JJTSMARTSParserState {" /-->
           <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-17 15:13:30.000000000 +0530
-+++ b/src/META-INF/atomtype.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-1.2.jar
---- a/src/META-INF/core.libdepends	2011-04-17 15:13:27.000000000 +0530
-+++ b/src/META-INF/core.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
---- a/src/META-INF/isomorphism.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/isomorphism.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/reaction.libdepends	2011-04-17 15:36:32.000000000 +0530
-+++ b/src/META-INF/reaction.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-1.2.jar
++log4j*.jar
  jgrapht-0.6.0.jar
- vecmath.jar
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  
---- a/src/META-INF/standard.libdepends	2011-04-17 15:36:32.000000000 +0530
-+++ b/src/META-INF/standard.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-atomtype.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-atomtype.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-1.2.jar
- vecmath.jar
++log4j*.jar
+ vecmath*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-builder3d.libdepends	2011-04-17 15:36:32.000000000 +0530
-+++ b/src/META-INF/test-builder3d.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-charges.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-charges.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-core.libdepends	2011-04-17 15:36:32.000000000 +0530
-+++ b/src/META-INF/test-core.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-1.2.jar
- vecmath.jar
++log4j*.jar
+ vecmath*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-data.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-data.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-1.2.jar
- vecmath.jar
---- a/src/META-INF/test-datadebug.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-datadebug.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
- vecmath.jar
---- a/src/META-INF/test-diff.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-diff.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
---- a/src/META-INF/test-extra.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-extra.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
++log4j*.jar
  sjava-0.68.jar
- vecmath.jar
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/test-fingerprint.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-fingerprint.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
  jgrapht-0.6.0.jar
 -log4j.jar
-+log4j-1.2.jar
---- a/src/META-INF/test-forcefield.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-forcefield.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
- vecmath.jar
---- a/src/META-INF/test-formula.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-formula.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
- vecmath.jar
++log4j*.jar
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/test-inchi.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-inchi.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  jniinchi-0.5.jar
  cmlxom-2.5-b1.jar
 -log4j.jar
-+log4j-1.2.jar
---- a/src/META-INF/test-interfaces.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-interfaces.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
---- a/src/META-INF/test-io.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-io.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
- vecmath.jar
++log4j*.jar
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  xpp3-1.1.4c.jar
---- a/src/META-INF/test-ioformats.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-ioformats.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-1.2.jar
- vecmath.jar
++log4j*.jar
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  xpp3-1.1.4c.jar
---- a/src/META-INF/test-ionpot.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-ionpot.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-1.2.jar
- vecmath.jar
++log4j*.jar
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/test-isomorphism.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-isomorphism.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-libiocml.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-libiocml.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  cmlxom-2.5-b1.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-libiomd.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-libiomd.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  cmlxom-2.5-b1.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/test-nonotify.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-nonotify.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
- vecmath.jar
---- a/src/META-INF/test-pcore.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-pcore.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
- vecmath.jar
++log4j*.jar
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/test-pdb.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-pdb.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
  
 -log4j.jar
-+log4j-1.2.jar
- vecmath.jar
---- a/src/META-INF/test-qsar.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-qsar.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  JRI.jar
  sjava-0.68.jar
---- a/src/META-INF/test-qsaratomic.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-qsaratomic.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  JRI.jar
  sjava-0.68.jar
---- a/src/META-INF/test-qsarbond.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-qsarbond.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  JRI.jar
  sjava-0.68.jar
---- a/src/META-INF/test-qsarionpot.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-qsarionpot.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  JRI.jar
  sjava-0.68.jar
---- a/src/META-INF/test-qsarmolecular.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-qsarmolecular.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  JRI.jar
  sjava-0.68.jar
---- a/src/META-INF/test-qsarprotein.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-qsarprotein.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
++log4j*.jar
  jama-1.0.2.jar
  jgrapht-0.6.0.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  JRI.jar
  sjava-0.68.jar
---- a/src/META-INF/test-reaction.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-reaction.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-1.2.jar
- vecmath.jar
++log4j*.jar
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/test-render.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-render.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
- vecmath.jar
---- a/src/META-INF/test-sdg.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-sdg.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
- vecmath.jar
++log4j*.jar
+ vecmath*.jar
  jgrapht-0.6.0.jar
---- a/src/META-INF/test-smarts.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-smarts.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-1.2.jar
- vecmath.jar
---- a/src/META-INF/test-smiles.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-smiles.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
- vecmath.jar
++log4j*.jar
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  cmlxom-2.5-b1.jar
---- a/src/META-INF/test-standard.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-standard.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-1.2.jar
++log4j*.jar
  jgrapht-0.6.0.jar
- vecmath.jar
+ vecmath*.jar
  cmlxom-2.5-b1.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/test-structgen.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-structgen.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-1.2.jar
++log4j*.jar
  jgrapht-0.6.0.jar
- vecmath.jar
---- a/src/META-INF/test-valencycheck.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test-valencycheck.libdepends	2011-04-17 15:36:33.000000000 +0530
+ 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-1.2.jar
- vecmath.jar
---- a/src/META-INF/test.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/test.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -log4j.jar
-+log4j-1.2.jar
---- a/src/META-INF/dict.libdepends	2011-04-17 15:13:29.000000000 +0530
-+++ b/src/META-INF/dict.libdepends	2011-04-17 15:36:33.000000000 +0530
++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-17 15:36:32.000000000 +0530
-+++ b/src/META-INF/extra.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/inchi.libdepends	2011-04-17 15:36:32.000000000 +0530
-+++ b/src/META-INF/inchi.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  jniinchi-0.5.jar
  cmlxom-2.5-b1.jar
---- a/src/META-INF/libiocml.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/libiocml.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar
  cmlxom-2.5-b1.jar
  
---- a/src/META-INF/libiomd.libdepends	2011-04-17 15:13:27.000000000 +0530
-+++ b/src/META-INF/libiomd.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/pcore.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/pdbcml.libdepends	2011-04-17 15:13:29.000000000 +0530
-+++ b/src/META-INF/pdbcml.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
++xom*.jar
  cmlxom-2.5-b1.jar
---- a/src/META-INF/qsar.libdepends	2011-04-17 15:36:32.000000000 +0530
-+++ b/src/META-INF/qsar.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/qsaratomic.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/qsaratomic.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/qsarbond.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/qsarbond.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/qsarcml.libdepends	2011-04-17 15:13:30.000000000 +0530
-+++ b/src/META-INF/qsarcml.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
++xom*.jar
  cmlxom-2.5-b1.jar
---- a/src/META-INF/qsarmolecular.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/qsarmolecular.libdepends	2011-04-17 15:36:33.000000000 +0530
+--- 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
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
---- a/src/META-INF/qsarprotein.libdepends	2011-04-17 15:36:33.000000000 +0530
-+++ b/src/META-INF/qsarprotein.libdepends	2011-04-17 15:36:33.000000000 +0530
++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
+ vecmath*.jar
 -xom-1.1.jar
-+xom.jar
++xom*.jar

Modified: trunk/cdk/debian/watch
===================================================================
--- trunk/cdk/debian/watch	2011-04-28 00:44:26 UTC (rev 13605)
+++ trunk/cdk/debian/watch	2011-04-28 17:38:40 UTC (rev 13606)
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/cdk/ cdk-(1\.2[\d\.]+)\.tar\.gz debian uupdate
+http://sf.net/cdk/ cdk-(1\.[2468]\.[\d\.]+)\.tar\.gz debian uupdate




More information about the pkg-java-commits mailing list