This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master-1.0 in repository plexus-containers.
commit 9846ab85e98e5f9b830bc4984bd49433694a7369 Author: Emmanuel Bourg <ebo...@apache.org> Date: Mon Jul 24 14:14:47 2017 +0200 Build with maven-debian-helper instead of maven-ant-helper --- debian/README.Debian | 8 ----- debian/build.properties | 3 -- debian/build.xml | 48 ---------------------------- debian/changelog | 1 + debian/clean | 1 + debian/control | 17 ++++------ debian/libplexus-containers-java-doc.install | 1 + debian/libplexus-containers-java.poms | 1 + debian/rules | 37 ++++++--------------- 9 files changed, 20 insertions(+), 97 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index fbad221..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,8 +0,0 @@ -This package installs versioned jar files into /usr/share/java/ and some -less versioned symlinks: - -component-api-1.0.jar -container-default-1.0.jar - -The unversioned symlinks are already used by other packages with older -upstream releases of the jars and they might be installed in parallel. diff --git a/debian/build.properties b/debian/build.properties deleted file mode 100644 index 6b8a4ef..0000000 --- a/debian/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -javadoc.dir=build/api -maven.test.skip=true -build.javaVersion=1.5 diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index 0594f78..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0"?> - -<project name="plexus-containers" default="package" basedir=".."> - - <property file="debian/build.properties"/> - <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/> - <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/> - - <macrodef name="cleanmodule"> - <attribute name="dir"/> - <sequential> - <ant target="clean" antfile="${maven.build}" dir="@{dir}"> - <property name="debian.dir" location="debian" /> - <property name="project.dir" value="@{dir}" /> - </ant> - </sequential> - </macrodef> - - <macrodef name="packagemodule"> - <attribute name="dir"/> - <sequential> - <ant target="package" antfile="${maven.build}" dir="@{dir}"> - <property name="debian.dir" location="debian" /> - <property name="project.dir" value="@{dir}" /> - </ant> - </sequential> - </macrodef> - - <target name="clean"> - <delete dir="build"/> - <cleanmodule dir="plexus-container-default"/> - <cleanmodule dir="plexus-component-annotations"/> - </target> - - <target name="package"> - <packagemodule dir=""/> - <packagemodule dir="plexus-container-default"/> - <packagemodule dir="plexus-component-annotations"/> - </target> - - <target name="javadoc"> - <javadoc destdir="${javadoc.dir}" locale="en"> - <packageset dir="plexus-container-default/src/main/java/"/> - <packageset dir="plexus-component-annotations/src/main/java/"/> - </javadoc> - </target> - -</project> diff --git a/debian/changelog b/debian/changelog index e41c72d..f07bec5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ plexus-containers (1.0~beta3.0.7-9) 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.0.0 * Switch to debhelper level 10 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..2f522bf --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +plexus-component-metadata/pom.xml diff --git a/debian/control b/debian/control index 96b0cd1..05e14a2 100644 --- a/debian/control +++ b/debian/control @@ -4,16 +4,14 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Torsten Werner <twer...@debian.org>, Ludovic Claude <ludovic.cla...@laposte.net> -Build-Depends: cdbs (>= 0.4.5.3), debhelper (>= 10), default-jdk -Build-Depends-Indep: ant, - ant-optional, - junit, +Build-Depends: debhelper (>= 10), default-jdk +Build-Depends-Indep: junit, libguava-java, + libmaven-javadoc-plugin-java, libplexus-classworlds-java, libplexus-utils-java, libxbean-java, - maven-ant-helper (>> 4), - maven-repo-helper + maven-debian-helper (>= 2.2) Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-containers.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-containers.git @@ -21,11 +19,8 @@ Homepage: http://plexus.codehaus.org Package: libplexus-containers-java Architecture: all -Depends: libguava-java, - libplexus-classworlds-java, - libplexus-utils-java, - libxbean-java, - ${misc:Depends} +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends} Conflicts: libplexus-container-default-java (<= 1.0-alpha-9-stable-1-2) Description: utilities for the Plexus framework The Plexus project provides a full software stack for creating and executing diff --git a/debian/libplexus-containers-java-doc.install b/debian/libplexus-containers-java-doc.install new file mode 100644 index 0000000..6f1c17c --- /dev/null +++ b/debian/libplexus-containers-java-doc.install @@ -0,0 +1 @@ +target/site/apidocs/* /usr/share/doc/libplexus-containers-java/api/ diff --git a/debian/libplexus-containers-java.poms b/debian/libplexus-containers-java.poms index cee9929..2046581 100644 --- a/debian/libplexus-containers-java.poms +++ b/debian/libplexus-containers-java.poms @@ -2,3 +2,4 @@ pom.xml --no-parent plexus-container-default/pom.xml plexus-component-javadoc/pom.xml --ignore plexus-component-annotations/pom.xml +plexus-component-metadata/pom.xml --ignore diff --git a/debian/rules b/debian/rules index d9e438f..50e5eaa 100755 --- a/debian/rules +++ b/debian/rules @@ -1,32 +1,15 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +%: + dh $@ -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~beta/-beta-/") -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps commons-cli guava maven2 plexus-classworlds junit \ - plexus-utils xbean-reflect -DEB_ANT_BUILD_TARGET := package javadoc -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -API_DOCS := build/api -MODULES := container-default component-annotations +override_dh_auto_configure: + mkdir -p plexus-component-metadata + touch plexus-component-metadata/pom.xml + dh_auto_configure -get-orig-source: - uscan --download-version $(VERSION) --force-download --rename - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - set -e; for MODULE in $(MODULES); do \ - mh_installjar -plib$(PACKAGE)-java -l --usj-name=plexus-$$MODULE plexus-$$MODULE/pom.xml plexus-$$MODULE/build/plexus-$$MODULE-$(VERSION).jar; \ - done +override_dh_auto_build: + dh_auto_build -binary-post-install/lib$(PACKAGE)-java-doc:: - dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java - -clean:: - mh_clean - -rm -rf debian/tmp - mh_unpatchpoms -plib$(PACKAGE)-java +get-orig-source: + uscan --download-current-version --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-containers.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits