diff -Nru commons-math3-3.2/debian/ant.properties commons-math3-3.2/debian/ant.properties --- commons-math3-3.2/debian/ant.properties 2013-04-06 12:48:54.000000000 +0000 +++ commons-math3-3.2/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -junit.jar=/usr/share/java/junit4.jar -# Ensure that source and target are 1.5 -# For backwards compat on Java 7 -ant.build.javac.source=1.5 -ant.build.javac.target=1.5 - diff -Nru commons-math3-3.2/debian/changelog commons-math3-3.2/debian/changelog --- commons-math3-3.2/debian/changelog 2013-06-25 13:36:56.000000000 +0000 +++ commons-math3-3.2/debian/changelog 2014-01-18 08:57:16.000000000 +0000 @@ -1,3 +1,12 @@ +commons-math3 (3.2-4) unstable; urgency=medium + + * Build with maven-debian-helper + * Standards-Version updated to 3.9.5 (no changes) + * Switch to debhelper level 9 + * Ignore the unstable BOBYQAOptimizer tests (Closes: #735792) + + -- Emmanuel Bourg Sat, 18 Jan 2014 09:55:20 +0100 + commons-math3 (3.2-3) unstable; urgency=low * Added ant-junit4 to the classpath to fix the test failures (Closes: #713763) diff -Nru commons-math3-3.2/debian/compat commons-math3-3.2/debian/compat --- commons-math3-3.2/debian/compat 2013-04-06 12:48:54.000000000 +0000 +++ commons-math3-3.2/debian/compat 2014-01-17 21:19:50.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru commons-math3-3.2/debian/control commons-math3-3.2/debian/control --- commons-math3-3.2/debian/control 2013-06-25 13:36:22.000000000 +0000 +++ commons-math3-3.2/debian/control 2014-01-17 23:55:27.000000000 +0000 @@ -1,14 +1,14 @@ Source: commons-math3 -Maintainer: Debian Java Maintainers -Uploaders: Emmanuel Bourg -Standards-Version: 3.9.4 Section: java Priority: optional -Build-Depends: default-jdk, ant, debhelper (>= 7), cdbs -Build-Depends-Indep: junit4, ant-optional, maven-repo-helper -Homepage: http://commons.apache.org/math/ +Maintainer: Debian Java Maintainers +Uploaders: Emmanuel Bourg +Build-Depends: default-jdk, ant, debhelper (>= 9), cdbs +Build-Depends-Indep: junit4, ant-optional, maven-debian-helper, libmaven-javadoc-plugin-java +Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/commons-math3 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/commons-math3 +Homepage: http://commons.apache.org/math/ Package: libcommons-math3-java Architecture: all diff -Nru commons-math3-3.2/debian/docs commons-math3-3.2/debian/docs --- commons-math3-3.2/debian/docs 2013-04-06 12:48:54.000000000 +0000 +++ commons-math3-3.2/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -RELEASE-NOTES.txt diff -Nru commons-math3-3.2/debian/libcommons-math3-java-doc.install commons-math3-3.2/debian/libcommons-math3-java-doc.install --- commons-math3-3.2/debian/libcommons-math3-java-doc.install 2013-04-06 12:48:54.000000000 +0000 +++ commons-math3-3.2/debian/libcommons-math3-java-doc.install 2014-01-17 23:09:30.000000000 +0000 @@ -1 +1 @@ -target/api /usr/share/doc/libcommons-math3-java +target/apidocs/* /usr/share/doc/libcommons-math3-java/api diff -Nru commons-math3-3.2/debian/libcommons-math3-java.poms commons-math3-3.2/debian/libcommons-math3-java.poms --- commons-math3-3.2/debian/libcommons-math3-java.poms 2013-04-06 12:48:54.000000000 +0000 +++ commons-math3-3.2/debian/libcommons-math3-java.poms 2014-01-17 21:28:07.000000000 +0000 @@ -1 +1,28 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the tag from the POM +# --package=: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=: name to use when installing the library in /usr/share/java +# --usj-version=: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=: Optional, the classifier for the jar. Empty by default. +# --site-xml=: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --has-package-version --java-lib --no-parent diff -Nru commons-math3-3.2/debian/maven.ignoreRules commons-math3-3.2/debian/maven.ignoreRules --- commons-math3-3.2/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 +++ commons-math3-3.2/debian/maven.ignoreRules 2014-01-17 21:27:11.000000000 +0000 @@ -0,0 +1,9 @@ + +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-changes-plugin * * * * +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-pmd-plugin * * * * +org.apache.maven.plugins maven-scm-publish-plugin * * * * +org.apache.rat apache-rat-plugin * * * * +org.codehaus.mojo clirr-maven-plugin * * * * +org.codehaus.mojo findbugs-maven-plugin * * * * diff -Nru commons-math3-3.2/debian/maven.properties commons-math3-3.2/debian/maven.properties --- commons-math3-3.2/debian/maven.properties 1970-01-01 00:00:00.000000000 +0000 +++ commons-math3-3.2/debian/maven.properties 2014-01-18 00:09:00.000000000 +0000 @@ -0,0 +1 @@ +project.build.sourceEncoding=UTF-8 diff -Nru commons-math3-3.2/debian/maven.rules commons-math3-3.2/debian/maven.rules --- commons-math3-3.2/debian/maven.rules 2013-04-06 12:48:54.000000000 +0000 +++ commons-math3-3.2/debian/maven.rules 2014-01-17 21:28:16.000000000 +0000 @@ -1 +1,2 @@ -junit junit jar s/4\..*/4.x/ + +junit junit jar s/4\..*/4.x/ * * diff -Nru commons-math3-3.2/debian/patches/01_ignore_unstable_tests.diff commons-math3-3.2/debian/patches/01_ignore_unstable_tests.diff --- commons-math3-3.2/debian/patches/01_ignore_unstable_tests.diff 1970-01-01 00:00:00.000000000 +0000 +++ commons-math3-3.2/debian/patches/01_ignore_unstable_tests.diff 2014-01-17 23:12:18.000000000 +0000 @@ -0,0 +1,39 @@ +Description: Ignore unstable BOBYQAOptimizer tests +Author: Emmanuel Bourg +Bug: https://issues.apache.org/jira/browse/MATH-1057 +--- a/src/test/java/org/apache/commons/math3/optim/nonlinear/scalar/noderiv/BOBYQAOptimizerTest.java ++++ b/src/test/java/org/apache/commons/math3/optim/nonlinear/scalar/noderiv/BOBYQAOptimizerTest.java +@@ -179,6 +179,7 @@ + } + + @Test ++ @Ignore + public void testDiffPow() { + double[] startPoint = point(DIM/2,1.0); + double[][] boundaries = null; +@@ -201,6 +202,7 @@ + } + + @Test ++ @Ignore + public void testAckley() { + double[] startPoint = point(DIM,0.1); + double[][] boundaries = null; +--- a/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java ++++ b/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java +@@ -178,6 +178,7 @@ + } + + @Test ++ @Ignore + public void testDiffPow() { + double[] startPoint = point(DIM/2,1.0); + double[][] boundaries = null; +@@ -200,6 +201,7 @@ + } + + @Test ++ @Ignore + public void testAckley() { + double[] startPoint = point(DIM,0.1); + double[][] boundaries = null; diff -Nru commons-math3-3.2/debian/patches/02_no_tests_on_build.diff commons-math3-3.2/debian/patches/02_no_tests_on_build.diff --- commons-math3-3.2/debian/patches/02_no_tests_on_build.diff 2013-04-06 12:48:54.000000000 +0000 +++ commons-math3-3.2/debian/patches/02_no_tests_on_build.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: build.xml: don't run test directly after build - as per Java Policy: "Failing tests MUST not lead to a failing build." -Author: Damien Raude-Morvan -Forwarded: not-needed -Origin: vendor -Last-Update: 2009-07-16 ---- a/build.xml -+++ b/build.xml -@@ -255,7 +255,7 @@ - - - -- -+ - - - diff -Nru commons-math3-3.2/debian/patches/03_fix_version.diff commons-math3-3.2/debian/patches/03_fix_version.diff --- commons-math3-3.2/debian/patches/03_fix_version.diff 2013-04-06 13:04:59.000000000 +0000 +++ commons-math3-3.2/debian/patches/03_fix_version.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Fixes the version in the build file -Author: Emmanuel Bourg -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -52,7 +52,7 @@ - - - -- -+ - - - diff -Nru commons-math3-3.2/debian/patches/series commons-math3-3.2/debian/patches/series --- commons-math3-3.2/debian/patches/series 2013-04-06 12:48:54.000000000 +0000 +++ commons-math3-3.2/debian/patches/series 2014-01-17 21:48:45.000000000 +0000 @@ -1,2 +1 @@ -02_no_tests_on_build.diff -03_fix_version.diff +01_ignore_unstable_tests.diff diff -Nru commons-math3-3.2/debian/rules commons-math3-3.2/debian/rules --- commons-math3-3.2/debian/rules 2013-06-25 12:24:12.000000000 +0000 +++ commons-math3-3.2/debian/rules 2014-01-17 21:22:49.000000000 +0000 @@ -1,28 +1,11 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-junit ant-junit4 -ANT_ARGS := -Dskip.download=true +JAVA_HOME := /usr/lib/jvm/default-java -PACKAGE := $(DEB_SOURCE_PACKAGE) - -DEB_ANT_CLEAN_TARGET := clean -DEB_ANT_BUILD_TARGET := jar javadoc -DEB_ANT_CHECK_TARGET := test - -# Per Debian Java Policy, install a versioned JAR and an unversioned symlink -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml target/commons-math-$(DEB_UPSTREAM_VERSION).jar - -install/lib$(PACKAGE)-java-doc:: - mv target/apidocs target/api - -clean:: - mh_clean +DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt get-orig-source: - uscan --force-download --rename + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename