This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-archiver.
commit ee465e3cb0171b97b65696420cafd18da70d97f9 Author: Emmanuel Bourg <[email protected]> Date: Tue Jul 18 10:26:57 2017 +0200 Build with maven-debian-helper instead of maven-ant-helper --- debian/build.properties | 2 -- debian/changelog | 1 + debian/control | 15 +++++---------- debian/libplexus-archiver-java.poms | 2 +- debian/maven.ignoreRules | 2 ++ debian/rules | 24 +++--------------------- 6 files changed, 12 insertions(+), 34 deletions(-) diff --git a/debian/build.properties b/debian/build.properties deleted file mode 100644 index e2ae10b..0000000 --- a/debian/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -javadoc.dir=build/api -maven.test.skip=true diff --git a/debian/changelog b/debian/changelog index 548ebcc..4bd15e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ plexus-archiver (2.2-2) UNRELEASED; urgency=medium * Team upload. + * Build with maven-debian-helper instead of maven-ant-helper * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 1a887b8..505d251 100644 --- a/debian/control +++ b/debian/control @@ -5,14 +5,11 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Torsten Werner <[email protected]>, Ludovic Claude <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: cdbs (>= 0.4.5.3), debhelper (>= 10), default-jdk -Build-Depends-Indep: ant, - ant-optional, - libplexus-containers-java, +Build-Depends: debhelper (>= 10), default-jdk +Build-Depends-Indep: libplexus-containers-java, libplexus-io-java, libplexus-utils-java, - maven-ant-helper (>> 4), - maven-repo-helper (>> 0.5) + maven-debian-helper (>= 2.2) Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-archiver.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-archiver.git @@ -20,10 +17,8 @@ Homepage: http://plexus.codehaus.org/plexus-components/plexus-archiver/ Package: libplexus-archiver-java Architecture: all -Depends: libplexus-containers-java, - libplexus-io-java, - libplexus-utils-java, - ${misc:Depends} +Depends: ${maven:Depends}, ${misc:Depends} +Suggests: ${maven:OptionalDepends} Breaks: libmaven-assembly-plugin (<= 2.2~beta5-2) Description: Archiver plugin for the Plexus compiler system The Plexus project provides a full software stack for creating and diff --git a/debian/libplexus-archiver-java.poms b/debian/libplexus-archiver-java.poms index 43e746b..87f2cc6 100644 --- a/debian/libplexus-archiver-java.poms +++ b/debian/libplexus-archiver-java.poms @@ -1 +1 @@ -pom.xml --no-parent +pom.xml --no-parent --has-package-version diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..c3b131f --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,2 @@ + +org.apache.maven.plugins maven-enforcer-plugin * * * * diff --git a/debian/rules b/debian/rules index 6ed6514..5a6351f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,7 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~alpha/-alpha-/") -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps plexus-io plexus-container-default plexus-utils -DEB_ANT_BUILD_TARGET := package #javadoc -DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml -DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -API_DOCS := build/api +%: + dh $@ get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar - -clean:: - mh_unpatchpoms -plib$(PACKAGE)-java - mh_clean - + uscan --download-current-version --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-archiver.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
