[cdk] 51/62: Prepare cdk 1.4.9-1 release

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Mar 30 21:56:41 BST 2018


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

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

commit 929674e1398fe9425ebdf8e74d45b4d9dd98c20d
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date:   Sat May 19 12:37:06 2012 +0000

    Prepare cdk 1.4.9-1 release
---
 debian/README.Debian              |  16 +--
 debian/ant.properties             |   8 +-
 debian/changelog                  |  10 ++
 debian/compile.excludes           |  11 --
 debian/control                    |  18 ++-
 debian/patches/22_fix_build.patch | 247 +++++++++++++++++++++++++++++++++++---
 debian/rules                      |  26 ++--
 7 files changed, 275 insertions(+), 61 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index d0d407c..314c3ad 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,19 +2,13 @@ Some modules are built partially because the required build dependencies
 are not yet in archives. Following is the list of files excluded from
 compilation.
 
-org/openscience/cdk/inchi/InChIGeneratorFactory.java
-org/openscience/cdk/inchi/InChIGenerator.java
-org/openscience/cdk/inchi/InChIToStructure.java
-org/openscience/cdk/libio/cml/Convertor.java
-org/openscience/cdk/io/CMLWriter.java
-org/openscience/cdk/io/RssWriter.java
 org/openscience/cdk/libio/cml/PDBAtomCustomizer.java
 org/openscience/cdk/libio/cml/MDMoleculeCustomizer.java
-org/openscience/cdk/qsar/model/R/RModel.java
-org/openscience/cdk/qsar/model/R/CNNClassificationModel.java
-org/openscience/cdk/qsar/model/R/CNNRegressionModel.java
-org/openscience/cdk/qsar/model/R/LinearRegressionModel.java
-org/openscience/cdk/qsar/model/R/PLSRegressionModel.java
 org/openscience/cdk/libio/cml/QSARCustomizer.java
 
+Some modules are not built at all because the required build dependencies
+are not yet in archives. Following is the list of files excluded from
+compilation.
+inchi, libiocml, signature, smsd, tautomer, iordf
+
  -- Onkar Shinde <onkarshinde at ubuntu.com>  Mon, 18 Apr 2011 09:46:47 +0530
diff --git a/debian/ant.properties b/debian/ant.properties
index 9e84c7c..3db64fe 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,10 +1,4 @@
-jar=/usr/share/java
 lib=/usr/share/java
 devellib=/usr/share/java
 nowarn=on
-
-# CDK 1.0.x does not compile against Weka 2.5.7, see SF bug report #1895295
-weka.jar=skip
-
-# CDK 1.0.x is not tested againt Batik 1.7, see SF feature request #1895300
-compile.batik=false
+javaURL=file:///usr/share/doc/default-jdk-doc/api/
diff --git a/debian/changelog b/debian/changelog
index 13baac5..dc71a7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cdk (1:1.4.9-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #635182, LP: #280189)
+  * Build -doc package containing api docs.
+  * Refresh patch as per latest upstream source.
+  * Exclude modules inchi, libiocml, signature, smsd, tautomer, iordf as their
+    build dependencies are not in packaged yet.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Sat, 19 May 2012 18:05:17 +0530
+
 cdk (1:1.2.10-3) unstable; urgency=low
 
   * Remove Daniel Leidert from uploaders. Thanks for your work on package.
diff --git a/debian/compile.excludes b/debian/compile.excludes
index dd4c210..4fecac9 100644
--- a/debian/compile.excludes
+++ b/debian/compile.excludes
@@ -1,14 +1,3 @@
-**/InChIGeneratorFactory.java
-**/InChIGenerator.java
-**/InChIToStructure.java
-**/Convertor.java
-**/CMLWriter.java
-**/RssWriter.java
 **/PDBAtomCustomizer.java
 **/MDMoleculeCustomizer.java
-**/R/RModel.java
-**/CNNClassificationModel.java
-**/R/CNNRegressionModel.java
-**/R/LinearRegressionModel.java
-**/PLSRegressionModel.java
 **/QSARCustomizer.java
diff --git a/debian/control b/debian/control
index 97d1595..4cf2a4c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
 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, libvecmath-java, libxom-java, libjama-java, libxpp3-java, r-cran-rjava
+Build-Depends-Indep: ant-contrib, antlr, docbook-xsl (>= 1.66.1), javacc, liblog4j1.2-java, libxerces2-java, libjgrapht0.6-java, libvecmath-java, libxom-java, libjama-java, libxpp3-java, default-jdk-doc, liblog4j1.2-java-doc, libxerces2-java-doc, libjgrapht0.6-java-doc, libvecmath-java-doc, libxom-java-doc, libjama-java-doc
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cdk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cdk/#_trunk_cdk_
@@ -13,9 +13,23 @@ Homepage: http://cdk.sourceforge.net/
 Package: libcdk-java
 Architecture: all
 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
  information chemistry and in bioinformatics. It includes renderers,
  file IO, SMILES generation/parsing, maximal common substructure
  algorithms, fingerprinting and much, much more.
+ .
+ This package contains library jar files.
+
+Package: libcdk-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: Chemistry Development Kit (CDK) Java libraries (API documentation)
+ The CDK is a library of Java classes used in computational and
+ information chemistry and in bioinformatics. It includes renderers,
+ file IO, SMILES generation/parsing, maximal common substructure
+ algorithms, fingerprinting and much, much more.
+ .
+ This package contains API documentation.
diff --git a/debian/patches/22_fix_build.patch b/debian/patches/22_fix_build.patch
index 84672b9..7f4c379 100644
--- a/debian/patches/22_fix_build.patch
+++ b/debian/patches/22_fix_build.patch
@@ -3,10 +3,23 @@ Description: Disable components which fail to build because of yet unpackaged
  per names in system.
 Forwarded: not-needed
 Author: Onkar Shinde <onshinde at ubuntu.com>
---- 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 @@
+--- a/build.xml	2012-04-03 23:24:33.000000000 +0530
++++ b/build.xml	2012-05-19 18:03:17.000000000 +0530
+@@ -38,18 +38,18 @@
+          <property environment="env" />
+ 
      <!-- Include the ant-contrib goodies -->
+-    <taskdef name="javancss" classname="javancss.JavancssAntTask">
++    <!--taskdef name="javancss" classname="javancss.JavancssAntTask">
+         <classpath>
+             <pathelement location="${basedir}/develjar/javacc.jar"/>
+             <pathelement location="${basedir}/develjar/javancss.jar"/>
+             <pathelement location="${basedir}/develjar/ccl.jar"/>
+             <pathelement location="${basedir}/develjar/jhbasic.jar"/>
+         </classpath>
+-    </taskdef>
++    </taskdef-->
+     <!-- Include the JavaNCSS goodies -->
      <taskdef resource="net/sf/antcontrib/antlib.xml">
          <classpath>
 -            <pathelement location="${basedir}/develjar/ant-contrib-1.0b3.jar"/>
@@ -14,7 +27,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
          </classpath>
      </taskdef>
  
-@@ -131,9 +131,9 @@
+@@ -143,9 +143,9 @@
  
              <!-- test for optional jars -->
              <available property="vecmath.present"
@@ -26,26 +39,16 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
              <available property="jgrapht.present"
                         file="${lib}/jgrapht-0.6.0.jar"/>
  
-@@ -362,13 +362,17 @@
-             </copy>
+@@ -378,7 +378,7 @@
+             <copy todir="${build}" file="build.props" />
  
              <!-- ok, now that we have a copy, compile this copy -->
 -            <javac srcdir="${build.src}/${module}" destdir="${build}/${module}" optimize="${optimization}"
 +            <javac sourcepath="" srcdir="${build.src}/${module}" destdir="${build}/${module}" optimize="${optimization}"
-                     debug="${debug}" deprecation="${deprecation}" target="1.5" source="1.5">
+                     debug="${debug}" deprecation="${deprecation}" source="${compile.target.version}" target="${compile.target.version}">
                  <classpath>
                      <fileset dir="${lib}" >
-                         <exclude name="**/*" unless="module.libdepends.present" />
-                         <includesfile name="${metainf}/${module}.libdepends" if="module.libdepends.present" />
-                     </fileset>
-+                    <fileset dir="/usr/lib/R/site-library/rJava/jri" >
-+                        <exclude name="**/*" unless="module.libdepends.present" />
-+                        <includesfile name="${metainf}/${module}.libdepends" if="module.libdepends.present" />
-+                    </fileset>
-                     <fileset dir="${devellib}">
-                         <exclude name="**/*" unless="module.devellibdepends.present" />
-                         <includesfile name="${metainf}/${module}.devellibdepends" if="module.devellibdepends.present" />
-@@ -387,6 +391,7 @@
+@@ -403,6 +403,7 @@
  
                  <includesfile name="${build}/${module}.javafiles"/>
                  <includesfile name="${metainf}/${module}.autogenerated" if="module.autogenerated.present"/>
@@ -53,7 +56,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
              </javac>
  
          	<!-- create a autogenerated.classes file, if applicable, so that these files can be included in the jar -->
-@@ -468,8 +473,6 @@
+@@ -484,8 +485,6 @@
  	 <!-- OK, we now need to do some replacements such as 
  	      adding cdk.module tags and changing access modes
  	  -->
@@ -62,3 +65,209 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
           <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" >
+@@ -538,16 +537,16 @@
+             list="renderbasic"/>
+         <foreach target="compile-module" param="module"
+             parallel="${parallel}" maxthreads="${threadCount}"
+-            list="pdb,smiles,sdg,inchi,libiocml"/>
++            list="pdb,smiles,sdg"/>
+         <foreach target="compile-module" param="module"
+             parallel="${parallel}" maxthreads="${threadCount}"
+             list="control,extra,reaction,pdbcml,libiomd"/>
+         <foreach target="compile-module" param="module"
+             parallel="${parallel}" maxthreads="${threadCount}"
+-            list="charges,smarts,signature"/>
++            list="charges,smarts"/>
+         <foreach target="compile-module" param="module"
+             parallel="${parallel}" maxthreads="${threadCount}"
+-            list="qm,qsar,ionpot,fingerprint,pcore,smsd,tautomer"/>
++            list="qm,qsar,ionpot,fingerprint,pcore"/>
+         <foreach target="compile-module" param="module"
+             parallel="${parallel}" maxthreads="${threadCount}"
+             list="renderawt"/>
+@@ -556,7 +555,7 @@
+             list="qsaratomic,qsarbond,qsarprotein,qsarcml,qsarmolecular"/>
+         <foreach target="compile-module" param="module"
+             parallel="${parallel}" maxthreads="${threadCount}"
+-            list="forcefield,qsarionpot,iordf"/>
++            list="forcefield,qsarionpot"/>
+         <foreach target="compile-module" param="module"
+             parallel="${parallel}" maxthreads="${threadCount}"
+             list="builder3d,builder3dtools"/>
+@@ -1198,7 +1197,7 @@
+         </java>
+     </target>
+ 
+-    <target name="javancss" id="javancss" depends="runDoclet">
++    <!--target name="javancss" id="javancss" depends="runDoclet">
+         <mkdir dir="${build}" />
+         <echo>Calculating source statistics...</echo>
+ 	<javancss srcdir="${src}/main" includes="**/*.java"
+@@ -1215,7 +1214,7 @@
+ 	    classMetrics="false"
+ 	    functionMetrics="false"
+ 	/>
+-    </target>
++    </target-->
+ 
+     <!-- Regenerate template fingerprints in case the fingerprint code has been updated
+ 	 so that fingerprint bits are different from a previous version -->
+--- a/src/META-INF/cip.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/cip.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1 +1 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+--- a/src/META-INF/iordf.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/iordf.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1,4 +1,4 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+ jena/commons-logging-1.1.1.jar
+ jena/icu4j_3_4.jar
+ jena/iri.jar
+--- a/src/META-INF/renderawt.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/renderawt.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1 +1 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+--- a/src/META-INF/renderbasic.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/renderbasic.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1 +1 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+--- a/src/META-INF/smsd.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/smsd.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1,3 +1,3 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+ commons-cli-1.0.jar
+ signatures-1.0.jar
+--- a/src/META-INF/test-cip.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/test-cip.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1,2 +1,2 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+ jgrapht-0.6.0.jar
+--- a/src/META-INF/test-iordf.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/test-iordf.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1,4 +1,4 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+ log4j.jar
+ xercesImpl-2.9.0.jar
+ jena/commons-logging-1.1.1.jar
+--- a/src/META-INF/test-log4j.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/test-log4j.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1,2 +1,2 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+ log4j.jar
+--- a/src/META-INF/test-renderawt.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/test-renderawt.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1,2 +1,2 @@
+ log4j.jar
+-vecmath1.2-1.14.jar
++vecmath*.jar
+--- a/src/META-INF/test-renderbasic.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/test-renderbasic.libdepends	2012-05-19 18:03:17.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-signature.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/test-signature.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1,3 +1,3 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+ jgrapht-0.6.0.jar
+ signatures-1.0.jar
+--- a/src/META-INF/test-smsd.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/test-smsd.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1,4 +1,4 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+ commons-cli-1.0.jar
+ log4j.jar
+ jgrapht-0.6.0.jar
+--- a/src/META-INF/test-tautomer.libdepends	2012-04-03 23:24:33.000000000 +0530
++++ b/src/META-INF/test-tautomer.libdepends	2012-05-19 18:03:17.000000000 +0530
+@@ -1,4 +1,4 @@
+-vecmath1.2-1.14.jar
++vecmath*.jar
+ jgrapht-0.6.0.jar
+ jniinchi-0.7.jar
+ 
+--- a/javadoc.xml	2012-04-03 23:24:33.000000000 +0530
++++ b/javadoc.xml	2012-05-19 18:03:17.000000000 +0530
+@@ -33,8 +33,8 @@
+         </fileset>
+     </path>
+ 
+-    <taskdef name="doxygen" classname="org.doxygen.tools.DoxygenTask"
+-            classpath="develjar/ant_doxygen.jar" />
++    <!--taskdef name="doxygen" classname="org.doxygen.tools.DoxygenTask"
++            classpath="develjar/ant_doxygen.jar" /-->
+ 
+     <target name="doxygen" id="doxygen">
+         <mkdir dir="${doxygen.dir}" />
+@@ -59,13 +59,10 @@
+         <javadoc destdir="${javadoc.dir}"
+                  author="true" version="true" use="true"
+                  public="true"
+-                 windowtitle="CDK API - version ${TODAY_SVN}">
++                 windowtitle="CDK API - version ${TODAY_SVN}" encoding="UTF-8">
+             <classpath>
+                 <pathelement location="." />
+-                <fileset dir="jar">
+-                    <include name="*.jar" />
+-                </fileset>
+-                <fileset dir="jar/jena">
++                <fileset dir="${devellib}">
+                     <include name="*.jar" />
+                 </fileset>
+                  <dirset dir="src/main">
+@@ -80,18 +77,24 @@
+             <tag name="cdk.builddepends" scope="all" description="Required library to be able to compile this class:" />
+             <tag name="cdk.todo" scope="all" description="To do:" />
+             <tag name="cdk.license" scope="all" description="License:" />
+-            <taglet name="net.sf.cdk.tools.doclets.CDKCiteTaglet" path="jar/xom-1.1.jar:src/main" />
+-            <taglet name="net.sf.cdk.tools.doclets.CDKModuleTaglet" path="jar/xom-1.1.jar:src/main" />
+-            <taglet name="net.sf.cdk.tools.doclets.CDKBugTaglet" path="jar/xom-1.1.jar:src/main" />
+-            <taglet name="net.sf.cdk.tools.doclets.CDKDictRefTaglet" path="jar/xom-1.1.jar:src/main" />
+-            <taglet name="net.sf.cdk.tools.doclets.CDKInChITaglet" path="jar/xom-1.1.jar:src/main" />
+-            <taglet name="net.sf.cdk.tools.doclets.CDKThreadSafeTaglet" path="jar/xom-1.1.jar:src/main" />
+-            <taglet name="net.sf.cdk.tools.doclets.CDKThreadNonSafeTaglet" path="jar/xom-1.1.jar:src/main" />
+-            <taglet name="net.sf.cdk.tools.doclets.CDKGitTaglet" path="jar/xom-1.1.jar:src/main" />
++            <taglet name="net.sf.cdk.tools.doclets.CDKCiteTaglet" path="${lib}/xom.jar:${lib}/jaxen.jar:src/main" />
++            <taglet name="net.sf.cdk.tools.doclets.CDKModuleTaglet" path="${lib}/xom.jar:${lib}/jaxen.jar:src/main" />
++            <taglet name="net.sf.cdk.tools.doclets.CDKBugTaglet" path="${lib}/xom.jar:${lib}/jaxen.jar:src/main" />
++            <taglet name="net.sf.cdk.tools.doclets.CDKDictRefTaglet" path="${lib}/xom.jar:${lib}/jaxen.jar:src/main" />
++            <taglet name="net.sf.cdk.tools.doclets.CDKInChITaglet" path="${lib}/xom.jar:${lib}/jaxen.jar:src/main" />
++            <taglet name="net.sf.cdk.tools.doclets.CDKThreadSafeTaglet" path="${lib}/xom.jar:${lib}/jaxen.jar:src/main" />
++            <taglet name="net.sf.cdk.tools.doclets.CDKThreadNonSafeTaglet" path="${lib}/xom.jar:${lib}/jaxen.jar:src/main" />
++            <taglet name="net.sf.cdk.tools.doclets.CDKGitTaglet" path="${lib}/xom.jar:${lib}/jaxen.jar:src/main" />
+             <packageset dir="${src}/main" defaultexcludes="yes">
+                 <include name="org/openscience/cdk/**" />
+             </packageset>
+         	<link href="${javaURL}"/>
++        	<link href="file:///usr/share/doc/liblog4j1.2-java/api/" />
++        	<link href="file:///usr/share/doc/libxerces2-java-doc/api/xerces2/" />
++        	<link href="file:///usr/share/doc/libjgrapht-java/apidoc/" />
++        	<link href="file:///usr/share/doc/libvecmath-java-doc/api/" />
++        	<link href="file:///usr/share/doc/libxom-java/apidocs/" />
++        	<link href="file:///usr/share/doc/libjama-java-doc/api/" />
+         </javadoc>
+     </target>
+ 
+@@ -226,8 +229,8 @@
+     <javac srcdir="src/main" destdir="src/main"
+          includes="net/sf/cdk/tools/**/*Taglet.java" debug="on" optimize="off">
+       <classpath>
+-        <fileset dir="jar/">
+-          <include name="xom-1.1.jar" />
++        <fileset dir="${lib}">
++          <include name="xom.jar" />
+         </fileset>
+       </classpath>
+     </javac>
diff --git a/debian/rules b/debian/rules
index 3bf3fb2..b1b9420 100644
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,7 @@ 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 \
-	javacc
+DEB_JARS := javacc
 
 ANT_ARGS := -Dlib=/usr/share/java
 
@@ -19,9 +17,11 @@ COMPONENTS := \
 	builder3d \
 	builder3dtools \
 	charges \
+	cip \
 	control \
 	core \
 	data \
+	datadebug \
 	dict \
 	diff \
 	extra \
@@ -29,12 +29,12 @@ COMPONENTS := \
 	forcefield \
 	formula \
 	interfaces \
-	ioformats \
 	io \
+	ioformats \
 	ionpot \
 	isomorphism \
-	libiocml \
 	libiomd \
+	log4j \
 	nonotify \
 	pcore \
 	pdb \
@@ -47,7 +47,10 @@ COMPONENTS := \
 	qsarprotein \
 	reaction \
 	render \
+	renderawt \
+	renderbasic \
 	sdg \
+	silent \
 	smarts \
 	smiles \
 	standard \
@@ -60,13 +63,14 @@ clean::
 
 install/libcdk-java::
 	for COMPONENT in $(COMPONENTS); do \
-		install -m 644 dist/jar/cdk-$$COMPONENT.jar \
-			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; \
+		echo dist/jar/cdk-$$COMPONENT.jar >> debian/libcdk-java.jlibs; \
 		if [ $$COMPONENT != "core" ]; then \
-			echo usr/share/java/cdk-$$COMPONENT.jar cdk-core.jar >> debian/classpath; \
+			echo usr/share/java/cdk-$$COMPONENT.jar cdk-core.jar >> debian/libcdk-java.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; \
+			echo usr/share/java/cdk-$$COMPONENT.jar jama.jar jgrapht.jar log4j-1.2.jar xercesImpl.jar vecmath.jar xom.jar >> debian/libcdk-java.classpath; \
 		fi \
 	done
+
+build/libcdk-java-doc::
+	ant -verbose -propertyfile debian/ant.properties -Dversion=$(DEB_UPSTREAM_VERSION) -DTODAY_SVN=$(DEB_UPSTREAM_VERSION) -f javadoc.xml html
+	echo doc/cdk-javadoc-$(DEB_UPSTREAM_VERSION)/ usr/share/doc/libcdk-java/api/ > debian/libcdk-java-doc.javadoc

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



More information about the pkg-java-commits mailing list