[pkg-java] r18887 - in trunk/commons-math/debian: . patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Nov 5 16:20:22 UTC 2015
Author: ebourg-guest
Date: 2015-11-05 16:20:21 +0000 (Thu, 05 Nov 2015)
New Revision: 18887
Added:
trunk/commons-math/debian/maven.ignoreRules
trunk/commons-math/debian/maven.properties
Removed:
trunk/commons-math/debian/patches/02_no_tests_on_build.diff
Modified:
trunk/commons-math/debian/changelog
trunk/commons-math/debian/control
trunk/commons-math/debian/libcommons-math-java-doc.install
trunk/commons-math/debian/libcommons-math-java.poms
trunk/commons-math/debian/patches/series
trunk/commons-math/debian/rules
Log:
Build with maven-debian-helper
Modified: trunk/commons-math/debian/changelog
===================================================================
--- trunk/commons-math/debian/changelog 2015-11-03 00:07:28 UTC (rev 18886)
+++ trunk/commons-math/debian/changelog 2015-11-05 16:20:21 UTC (rev 18887)
@@ -1,6 +1,11 @@
commons-math (2.2-5) UNRELEASED; urgency=medium
* Team upload.
+
+ [ Emmanuel Bourg ]
+ * Build with maven-debian-helper (should make the build reproducible)
+
+ [ tony mancill ]
* Address lintian warning: pipe-symbol-used-as-license-disjunction
in debian/copyright.
* Bump Standards-Version to 3.9.6 (no changes)
Modified: trunk/commons-math/debian/control
===================================================================
--- trunk/commons-math/debian/control 2015-11-03 00:07:28 UTC (rev 18886)
+++ trunk/commons-math/debian/control 2015-11-05 16:20:21 UTC (rev 18887)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: default-jdk, ant, debhelper (>= 9), cdbs
-Build-Depends-Indep: junit4, ant-optional, maven-repo-helper
+Build-Depends: default-jdk, debhelper (>= 9), cdbs, maven-debian-helper
+Build-Depends-Indep: junit4, libmaven-javadoc-plugin-java
Standards-Version: 3.9.6
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/commons-math
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/commons-math
Modified: trunk/commons-math/debian/libcommons-math-java-doc.install
===================================================================
--- trunk/commons-math/debian/libcommons-math-java-doc.install 2015-11-03 00:07:28 UTC (rev 18886)
+++ trunk/commons-math/debian/libcommons-math-java-doc.install 2015-11-05 16:20:21 UTC (rev 18887)
@@ -1 +1 @@
-target/api /usr/share/doc/libcommons-math-java
+target/apidocs/* /usr/share/doc/libcommons-math-java/api
Modified: trunk/commons-math/debian/libcommons-math-java.poms
===================================================================
--- trunk/commons-math/debian/libcommons-math-java.poms 2015-11-03 00:07:28 UTC (rev 18886)
+++ trunk/commons-math/debian/libcommons-math-java.poms 2015-11-05 16:20:21 UTC (rev 18887)
@@ -1 +1,28 @@
-pom.xml --no-parent
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [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 <parent> tag from the POM
+# --package=<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=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: 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>: name to use when installing the library in /usr/share/java
+# --usj-version=<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=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --no-parent --has-package-version
Added: trunk/commons-math/debian/maven.ignoreRules
===================================================================
--- trunk/commons-math/debian/maven.ignoreRules (rev 0)
+++ trunk/commons-math/debian/maven.ignoreRules 2015-11-05 16:20:21 UTC (rev 18887)
@@ -0,0 +1,6 @@
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.codehaus.mojo clirr-maven-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *
Added: trunk/commons-math/debian/maven.properties
===================================================================
--- trunk/commons-math/debian/maven.properties (rev 0)
+++ trunk/commons-math/debian/maven.properties 2015-11-05 16:20:21 UTC (rev 18887)
@@ -0,0 +1,3 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
Deleted: trunk/commons-math/debian/patches/02_no_tests_on_build.diff
===================================================================
--- trunk/commons-math/debian/patches/02_no_tests_on_build.diff 2015-11-03 00:07:28 UTC (rev 18886)
+++ trunk/commons-math/debian/patches/02_no_tests_on_build.diff 2015-11-05 16:20:21 UTC (rev 18887)
@@ -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 <drazzib at drazzib.com>
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2009-07-16
---- a/build.xml
-+++ b/build.xml
-@@ -247,7 +247,7 @@
-
- <!-- ========== Create Jar ================================================ -->
-
-- <target name="jar" depends="test" description="Create jar file">
-+ <target name="jar" depends="compile" description="Create jar file">
-
- <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <copy file="NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
Modified: trunk/commons-math/debian/patches/series
===================================================================
--- trunk/commons-math/debian/patches/series 2015-11-03 00:07:28 UTC (rev 18886)
+++ trunk/commons-math/debian/patches/series 2015-11-05 16:20:21 UTC (rev 18887)
@@ -1,2 +1 @@
-02_no_tests_on_build.diff
03_java8_compatibility.patch
Modified: trunk/commons-math/debian/rules
===================================================================
--- trunk/commons-math/debian/rules 2015-11-03 00:07:28 UTC (rev 18886)
+++ trunk/commons-math/debian/rules 2015-11-05 16:20:21 UTC (rev 18887)
@@ -1,29 +1,9 @@
#!/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/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
-
-install/lib$(PACKAGE)-java-doc::
- mv target/apidocs target/api
-
-clean::
- mh_clean
- -rm -rf debian/tmp
-
get-orig-source:
uscan --force-download --rename
More information about the pkg-java-commits
mailing list