This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository httpcomponents-core.
commit 16a87fdb71e0ad91f42e23d0d5000bb03b20e18f Author: Emmanuel Bourg <[email protected]> Date: Tue Jan 7 01:29:38 2014 +0100 Build with maven-debian-helper --- debian/changelog | 1 + debian/control | 6 +++--- debian/libhttpcore-java.poms | 4 ++-- debian/maven.properties | 3 +++ debian/rules | 35 +++++------------------------------ 5 files changed, 14 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 535fec5..a29fc04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ httpcomponents-core (4.3-2) UNRELEASED; urgency=medium + * Build with maven-debian-helper * Standards-Version updated to 3.9.5 (no changes) * Switch to debhelper level 9 diff --git a/debian/control b/debian/control index 4ac5942..47a2e10 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]>, Emmanuel Bourg <[email protected]> -Build-Depends: debhelper (>= 9), +Build-Depends: cdbs, + debhelper (>= 9), default-jdk, libbuild-helper-maven-plugin-java, libmaven-antrun-plugin-java, @@ -12,8 +13,7 @@ Build-Depends: debhelper (>= 9), libmaven-javadoc-plugin-java (>= 1.5), libmaven-site-plugin-java, libsurefire-java, - maven-debian-helper, - maven-repo-helper + maven-debian-helper Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/pkg-java/httpcomponents-core.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/httpcomponents-core.git diff --git a/debian/libhttpcore-java.poms b/debian/libhttpcore-java.poms index a6454ff..c388f2a 100644 --- a/debian/libhttpcore-java.poms +++ b/debian/libhttpcore-java.poms @@ -26,7 +26,7 @@ # Empty by default. [mh_install] # pom.xml --no-parent --has-package-version -httpcore/pom.xml --has-package-version -httpcore-nio/pom.xml --has-package-version +httpcore/pom.xml --has-package-version --java-lib +httpcore-nio/pom.xml --has-package-version --java-lib httpcore-osgi/pom.xml --ignore httpcore-ab/pom.xml --ignore diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..205b14f --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,3 @@ +maven.test.skip=true +maven.compiler.source=1.5 +maven.compiler.target=1.5 diff --git a/debian/rules b/debian/rules index cef1d84..e18d4dd 100755 --- a/debian/rules +++ b/debian/rules @@ -1,36 +1,11 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/maven.mk -export JAVA_HOME=/usr/lib/jvm/default-java -CURVER := $(shell dpkg-parsechangelog | grep ^Version | cut -d\ -f2 | cut -d- -f1 ) +JAVA_HOME := /usr/lib/jvm/default-java -override_dh_auto_build: - mh_patchpoms -plibhttpcore-java --debian-build --keep-pom-version - # Some tests of httpcore-nio fail on debomatic, - # while work fine in my cowbuilder. - mvn-debian -Dmaven.test.skip=true package -Dmaven.compiler.source=1.5 -Dmaven.compiler.target=1.5 - -override_dh_auto_install: - dh_auto_install - dh_installchangelogs -plibhttpcore-java RELEASE_NOTES.txt - mh_installpoms -plibhttpcore-java - mh_installjar -plibhttpcore-java -l httpcore/pom.xml httpcore/target/httpcore*.jar - mh_installjar -plibhttpcore-java -l httpcore-nio/pom.xml httpcore-nio/target/httpcore*.jar - # remember to add pom-osgi.xml to the .poms file -# mh_installjar -plibhttpcore-java -l debian/pom-osgi.xml httpcore-osgi/target/httpcore*.jar - -override_dh_clean: - mh_unpatchpoms -plibhttpcore-java - dh_clean - mh_clean - rm -rf httpcore*/target/ - -%: - dh $@ +DEB_INSTALL_CHANGELOGS_ALL := RELEASE_NOTES.txt get-orig-source: - uscan --download-version $(CURVER) --force-download --rename - + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-core.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
