This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository classworlds.
commit 9219d3e4327d25b9bc3294d45fe6718affd2f0f9 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 21 16:12:13 2017 +0200 Build with maven-debian-helper instead of maven-ant-helper --- debian/build.properties | 3 --- debian/changelog | 1 + debian/control | 8 +++----- debian/libclassworlds-java-doc.install | 1 + debian/maven.ignoreRules | 1 + debian/maven.properties | 1 + debian/rules | 25 +++---------------------- 7 files changed, 10 insertions(+), 30 deletions(-) diff --git a/debian/build.properties b/debian/build.properties deleted file mode 100644 index 6866e43..0000000 --- a/debian/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -javadoc.dir=build/api -maven.test.skip=true -build.sourceDirectory=src/java/main diff --git a/debian/changelog b/debian/changelog index 8a5b9be..ec39e67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ classworlds (1.1-final-6) 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/control b/debian/control index 7e5f4e3..e586f00 100644 --- a/debian/control +++ b/debian/control @@ -7,15 +7,13 @@ Uploaders: Paul Cager <[email protected]>, Torsten Werner <[email protected]> Build-Depends: - ant, - ant-optional, - cdbs (>= 0.4.5.3), debhelper (>= 10), default-jdk, default-jdk-doc, + junit4, + libmaven-javadoc-plugin-java, libxalan2-java, - maven-ant-helper (>> 4), - maven-repo-helper + maven-debian-helper (>= 2.2) Standards-Version: 4.0.0 Homepage: http://classworlds.codehaus.org/ Vcs-Git: https://anonscm.debian.org/git/pkg-java/classworlds.git diff --git a/debian/libclassworlds-java-doc.install b/debian/libclassworlds-java-doc.install new file mode 100644 index 0000000..72a6e7e --- /dev/null +++ b/debian/libclassworlds-java-doc.install @@ -0,0 +1 @@ +target/apidocs/* /usr/share/doc/libclassworlds-java/api/ diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..90f0586 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1 @@ +org.apache.maven.plugins maven-antrun-plugin 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/rules b/debian/rules index 23f814a..5a6351f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,26 +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/-final//") -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-trax ant-nodeps xalan2 -DEB_ANT_BUILD_TARGET := package javadoc -DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml -DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -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 --usj-version=$(VERSION) build/$(PACKAGE)-$(VERSION).jar - -binary-post-install/lib$(PACKAGE)-java-doc:: - dh_install -plib$(PACKAGE)-java-doc build/api usr/share/doc/lib$(PACKAGE)-java - -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/classworlds.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
