Author: tmancill Date: 2013-12-31 04:45:28 +0000 (Tue, 31 Dec 2013) New Revision: 17626
Added: trunk/cdk/debian/patches/jama-1.0.3.patch Modified: trunk/cdk/debian/changelog trunk/cdk/debian/compat trunk/cdk/debian/control trunk/cdk/debian/patches/22_fix_build.patch trunk/cdk/debian/patches/ant19.patch trunk/cdk/debian/patches/series trunk/cdk/debian/rules Log: packaging changes for 1.2.10-5 Modified: trunk/cdk/debian/changelog =================================================================== --- trunk/cdk/debian/changelog 2013-12-31 04:39:47 UTC (rev 17625) +++ trunk/cdk/debian/changelog 2013-12-31 04:45:28 UTC (rev 17626) @@ -1,3 +1,13 @@ +cdk (1:1.2.10-5) unstable; urgency=medium + + * Team upload. + * Update Jama dependency for 1.0.3 for FTBFS bug. (Closes: #724120) + * Bump Standards-Version to 3.9.5. + * Use debhelper 9 instead of 7; correct debian/compat (was 5) + * Update Vcs- fields to use canonical URLs. + + -- tony mancill <[email protected]> Mon, 30 Dec 2013 16:14:46 -0800 + cdk (1:1.2.10-4) unstable; urgency=low * Team upload. Modified: trunk/cdk/debian/compat =================================================================== --- trunk/cdk/debian/compat 2013-12-31 04:39:47 UTC (rev 17625) +++ trunk/cdk/debian/compat 2013-12-31 04:45:28 UTC (rev 17626) @@ -1 +1 @@ -5 +9 Modified: trunk/cdk/debian/control =================================================================== --- trunk/cdk/debian/control 2013-12-31 04:39:47 UTC (rev 17625) +++ trunk/cdk/debian/control 2013-12-31 04:45:28 UTC (rev 17626) @@ -3,11 +3,22 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Onkar Shinde <[email protected]> -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 -Standards-Version: 3.9.4 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cdk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cdk/#_trunk_cdk_ +Build-Depends: cdbs, debhelper (>= 9), 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 (>= 1.0.3), + libxpp3-java, + r-cran-rjava +Standards-Version: 3.9.5 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/cdk +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/cdk Homepage: http://cdk.sourceforge.net/ Package: libcdk-java Modified: trunk/cdk/debian/patches/22_fix_build.patch =================================================================== --- trunk/cdk/debian/patches/22_fix_build.patch 2013-12-31 04:39:47 UTC (rev 17625) +++ trunk/cdk/debian/patches/22_fix_build.patch 2013-12-31 04:45:28 UTC (rev 17626) @@ -3,8 +3,8 @@ per names in system. Forwarded: not-needed Author: Onkar Shinde <[email protected]> ---- a/build.xml 2011-05-28 16:48:03.000000000 +0530 -+++ b/build.xml 2011-05-31 00:24:54.000000000 +0530 +--- a/build.xml ++++ b/build.xml @@ -39,7 +39,7 @@ <!-- Include the ant-contrib goodies --> <taskdef resource="net/sf/antcontrib/antlib.xml"> @@ -31,8 +31,9 @@ <!-- ok, now that we have a copy, compile this copy --> - <javac srcdir="${build.src}/${module}" destdir="${build}/${module}" optimize="${optimization}" +- debug="${debug}" deprecation="${deprecation}" target="1.5" source="1.5"> + <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}" target="1.6" source="1.6"> <classpath> <fileset dir="${lib}" > <exclude name="**/*" unless="module.libdepends.present" /> Modified: trunk/cdk/debian/patches/ant19.patch =================================================================== --- trunk/cdk/debian/patches/ant19.patch 2013-12-31 04:39:47 UTC (rev 17625) +++ trunk/cdk/debian/patches/ant19.patch 2013-12-31 04:45:28 UTC (rev 17626) @@ -5,9 +5,9 @@ Origin: other Bug-Debian: http://bugs.debian.org/712349 ---- cdk-1.4.9.orig/build.xml -+++ cdk-1.4.9/build.xml -@@ -168,6 +168,7 @@ +--- a/build.xml ++++ b/build.xml +@@ -156,6 +156,7 @@ <or> <contains string="${ant.version}" substring="1.7.1"/> <contains string="${ant.version}" substring="1.8"/> Added: trunk/cdk/debian/patches/jama-1.0.3.patch =================================================================== --- trunk/cdk/debian/patches/jama-1.0.3.patch (rev 0) +++ trunk/cdk/debian/patches/jama-1.0.3.patch 2013-12-31 04:45:28 UTC (rev 17626) @@ -0,0 +1,187 @@ +Description: update cdk to build against Jama 1.0.3 +Author: tony mancill <[email protected]> +Bug-Debian: http://bugs.debian.org/724120 + +--- +--- cdk-1.2.10.orig/src/META-INF/builder3d.libdepends ++++ cdk-1.2.10/src/META-INF/builder3d.libdepends +@@ -1,3 +1,3 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + vecmath*.jar + +--- cdk-1.2.10.orig/src/META-INF/extra.libdepends ++++ cdk-1.2.10/src/META-INF/extra.libdepends +@@ -1,3 +1,3 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + vecmath*.jar + xom*.jar +--- cdk-1.2.10.orig/src/META-INF/forcefield.libdepends ++++ cdk-1.2.10/src/META-INF/forcefield.libdepends +@@ -1,3 +1,3 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + vecmath*.jar + +--- cdk-1.2.10.orig/src/META-INF/qsar.libdepends ++++ cdk-1.2.10/src/META-INF/qsar.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + JRI.jar + jgrapht-0.6.0.jar + sjava-0.68.jar +--- cdk-1.2.10.orig/src/META-INF/qsaratomic.libdepends ++++ cdk-1.2.10/src/META-INF/qsaratomic.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + JRI.jar + jgrapht-0.6.0.jar + sjava-0.68.jar +--- cdk-1.2.10.orig/src/META-INF/qsarbond.libdepends ++++ cdk-1.2.10/src/META-INF/qsarbond.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + JRI.jar + jgrapht-0.6.0.jar + sjava-0.68.jar +--- cdk-1.2.10.orig/src/META-INF/qsarmolecular.libdepends ++++ cdk-1.2.10/src/META-INF/qsarmolecular.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + JRI.jar + jgrapht-0.6.0.jar + sjava-0.68.jar +--- cdk-1.2.10.orig/src/META-INF/qsarprotein.libdepends ++++ cdk-1.2.10/src/META-INF/qsarprotein.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + JRI.jar + jgrapht-0.6.0.jar + sjava-0.68.jar +--- cdk-1.2.10.orig/src/META-INF/test-builder3d.libdepends ++++ cdk-1.2.10/src/META-INF/test-builder3d.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + vecmath*.jar + log4j*.jar + jgrapht-0.6.0.jar +--- cdk-1.2.10.orig/src/META-INF/test-extra.libdepends ++++ cdk-1.2.10/src/META-INF/test-extra.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + cmlxom-2.5-b1.jar + log4j*.jar +--- cdk-1.2.10.orig/src/META-INF/test-forcefield.libdepends ++++ cdk-1.2.10/src/META-INF/test-forcefield.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + log4j*.jar + vecmath*.jar +--- cdk-1.2.10.orig/src/META-INF/test-formula.libdepends ++++ cdk-1.2.10/src/META-INF/test-formula.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + log4j*.jar + vecmath*.jar +--- cdk-1.2.10.orig/src/META-INF/test-ionpot.libdepends ++++ cdk-1.2.10/src/META-INF/test-ionpot.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + log4j*.jar + vecmath*.jar +--- cdk-1.2.10.orig/src/META-INF/test-qsar.libdepends ++++ cdk-1.2.10/src/META-INF/test-qsar.libdepends +@@ -1,6 +1,6 @@ + vecmath*.jar + log4j*.jar +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + xom*.jar + JRI.jar +--- cdk-1.2.10.orig/src/META-INF/test-qsaratomic.libdepends ++++ cdk-1.2.10/src/META-INF/test-qsaratomic.libdepends +@@ -1,6 +1,6 @@ + vecmath*.jar + log4j*.jar +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + xom*.jar + JRI.jar +--- cdk-1.2.10.orig/src/META-INF/test-qsarbond.libdepends ++++ cdk-1.2.10/src/META-INF/test-qsarbond.libdepends +@@ -1,6 +1,6 @@ + vecmath*.jar + log4j*.jar +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + xom*.jar + JRI.jar +--- cdk-1.2.10.orig/src/META-INF/test-qsarionpot.libdepends ++++ cdk-1.2.10/src/META-INF/test-qsarionpot.libdepends +@@ -1,6 +1,6 @@ + vecmath*.jar + log4j*.jar +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + xom*.jar + JRI.jar +--- cdk-1.2.10.orig/src/META-INF/test-qsarmolecular.libdepends ++++ cdk-1.2.10/src/META-INF/test-qsarmolecular.libdepends +@@ -1,6 +1,6 @@ + vecmath*.jar + log4j*.jar +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + xom*.jar + JRI.jar +--- cdk-1.2.10.orig/src/META-INF/test-qsarprotein.libdepends ++++ cdk-1.2.10/src/META-INF/test-qsarprotein.libdepends +@@ -1,6 +1,6 @@ + vecmath*.jar + log4j*.jar +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + xom*.jar + JRI.jar +--- cdk-1.2.10.orig/src/META-INF/test-reaction.libdepends ++++ cdk-1.2.10/src/META-INF/test-reaction.libdepends +@@ -1,4 +1,4 @@ +-jama-1.0.2.jar ++jama-1.0.3.jar + jgrapht-0.6.0.jar + log4j*.jar + vecmath*.jar +--- cdk-1.2.10.orig/src/main/org/openscience/cdk/qsar/descriptors/molecular/MomentOfInertiaDescriptor.java ++++ cdk-1.2.10/src/main/org/openscience/cdk/qsar/descriptors/molecular/MomentOfInertiaDescriptor.java +@@ -77,8 +77,8 @@ import javax.vecmath.Point3d; + * + * @author Rajarshi Guha + * @cdk.created 2005-02-07 +- * @cdk.builddepends Jama-1.0.2.jar +- * @cdk.depends Jama-1.0.2.jar ++ * @cdk.builddepends Jama-1.0.3.jar ++ * @cdk.depends Jama-1.0.3.jar + * @cdk.module qsarmolecular + * @cdk.githash + * @cdk.set qsar-descriptors Modified: trunk/cdk/debian/patches/series =================================================================== --- trunk/cdk/debian/patches/series 2013-12-31 04:39:47 UTC (rev 17625) +++ trunk/cdk/debian/patches/series 2013-12-31 04:45:28 UTC (rev 17626) @@ -1,2 +1,3 @@ 22_fix_build.patch ant19.patch +jama-1.0.3.patch Modified: trunk/cdk/debian/rules =================================================================== --- trunk/cdk/debian/rules 2013-12-31 04:39:47 UTC (rev 17625) +++ trunk/cdk/debian/rules 2013-12-31 04:45:28 UTC (rev 17626) @@ -1,8 +1,8 @@ #!/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 +include /usr/share/cdbs/1/rules/debhelper.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := \ _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
