This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository apache-directory-api.
commit d6706535706fdb9db72c0fdf48e0d33c11453c0a Author: Emmanuel Bourg <[email protected]> Date: Tue Jun 28 22:27:32 2016 +0200 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/control | 5 ++--- debian/rules | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index ecb525c..e4efda6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ apache-directory-api (1.0.0~M20-4) UNRELEASED; urgency=medium + * Build with the DH sequencer instead of CDBS * Standards-Version updated to 3.9.8 * Use a secure Vcs-Git URL diff --git a/debian/control b/debian/control index 1ed51e3..1da0e14 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Emmanuel Bourg <[email protected]> -Build-Depends: cdbs, - debhelper (>= 9), +Build-Depends: debhelper (>= 9), default-jdk, findbugs, libantlr-maven-plugin-java, @@ -20,7 +19,7 @@ Build-Depends: cdbs, libosgi-core-java, libslf4j-java, libxpp3-java, - maven-debian-helper (>= 1.5), + maven-debian-helper (>= 2.0), libmina2-java Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/apache-directory-api.git diff --git a/debian/rules b/debian/rules index 273758b..943c424 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,11 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +%: + dh $@ --buildsystem=maven -JAVA_HOME := /usr/lib/jvm/default-java +override_dh_install: + dh_install -install/libapache-directory-api-java:: # Keep only the api-all artifact rm -Rf debian/libapache-directory-api-java/usr/share/java/*.jar rm -Rf debian/libapache-directory-api-java/usr/share/maven-repo/* @@ -13,7 +13,8 @@ install/libapache-directory-api-java:: mh_installpom -plibapache-directory-api-java --no-parent all/dependency-reduced-pom.xml mh_installjar -plibapache-directory-api-java --java-lib --usj-name=apache-directory-api-all all/dependency-reduced-pom.xml all/target/api-all-*.jar -clean:: +override_dh_auto_clean: + dh_auto_clean find . -name MANIFEST.MF | xargs -r rm find . -name dependency-reduced-pom.xml | xargs -r rm -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-directory-api.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
