This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-ant-factory.
commit b6bdd069528c67323d075e2511d4aa5646d077fe Author: Emmanuel Bourg <[email protected]> Date: Tue Aug 29 21:29:00 2017 +0200 Build with maven-debian-helper instead of maven-ant-helper --- debian/build.properties | 2 -- debian/changelog | 1 + debian/control | 8 +++----- debian/maven.properties | 1 + debian/maven.rules | 1 + debian/rules | 22 +++------------------- 6 files changed, 9 insertions(+), 26 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 11fa1b6..349bee0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ plexus-ant-factory (1.0~alpha2.1-4) UNRELEASED; urgency=medium * Team upload. + * Build with maven-debian-helper instead of maven-ant-helper * Moved the package to Git * Standards-Version updated to 4.1.0 * Switch to debhelper level 10 diff --git a/debian/control b/debian/control index 7b0fbd2..7bd8082 100644 --- a/debian/control +++ b/debian/control @@ -8,12 +8,10 @@ Uploaders: Build-Depends: ant, ant-optional, - cdbs, debhelper (>= 10), default-jdk, libplexus-container-default-java, - maven-ant-helper (>> 4), - maven-repo-helper + maven-debian-helper (>= 2.2) Standards-Version: 4.1.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-ant-factory.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-ant-factory.git @@ -21,8 +19,8 @@ Homepage: http://plexus.codehaus.org/ Package: libplexus-ant-factory-java Architecture: all -Depends: libplexus-container-default-java, ${misc:Depends} -Recommends: ant +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends} Description: Plexus Ant Factory The Plexus project provides a full software stack for creating and executing software projects. Based on the Plexus container, the applications diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..d2f1b82 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1 @@ +maven.test.skip=true diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..c81efe6 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1 @@ +org.codehaus.plexus plexus-container-default * s/.*/1.0-alpha/ * * diff --git a/debian/rules b/debian/rules index 1fcb0a0..5a6351f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,23 +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-container-default-alpha classworlds plexus-utils -DEB_ANT_BUILD_TARGET := package -DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml -DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) +%: + 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/plexus-ant-factory-$(VERSION).jar - -clean:: - 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-ant-factory.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
