This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository trove.
commit 7e77c921f41e717765d8d087a93f263602a2da05 Author: Emmanuel Bourg <[email protected]> Date: Wed Apr 18 17:29:21 2018 +0200 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/clean | 1 + debian/control | 4 ++-- debian/libtrove-java-doc.doc-base | 4 ++-- debian/libtrove-java-doc.install | 1 + debian/libtrove-java.jlibs | 1 + debian/rules | 23 ++++------------------- 7 files changed, 12 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 207d27e..02cfe64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ trove (2.1.0-3) UNRELEASED; urgency=medium * Team upload. + * Build with the DH sequencer instead of CDBS * Removed Michael Koch from the uploaders (Closes: #654137) * Moved the package to Git * Standards-Version updated to 4.1.4 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..ea1472e --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +output/ diff --git a/debian/control b/debian/control index 4f017c6..350df8f 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,9 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Torsten Werner <[email protected]> Build-Depends: ant, - cdbs, debhelper (>= 11), - default-jdk + default-jdk, + javahelper Standards-Version: 4.1.4 Vcs-Git: https://anonscm.debian.org/git/pkg-java/trove.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/trove.git diff --git a/debian/libtrove-java-doc.doc-base b/debian/libtrove-java-doc.doc-base index 39323c4..831e0e2 100644 --- a/debian/libtrove-java-doc.doc-base +++ b/debian/libtrove-java-doc.doc-base @@ -6,5 +6,5 @@ Abstract: This is the programmer API of trove, a library for high Section: Programming Format: HTML -Index: /usr/share/doc/libtrove-java-doc/api/index.html -Files: /usr/share/doc/libtrove-java-doc/api/*.html +Index: /usr/share/doc/libtrove-java/api/index.html +Files: /usr/share/doc/libtrove-java/api/*.html diff --git a/debian/libtrove-java-doc.install b/debian/libtrove-java-doc.install new file mode 100644 index 0000000..66cecbf --- /dev/null +++ b/debian/libtrove-java-doc.install @@ -0,0 +1 @@ +output/javadocs/* /usr/share/doc/libtrove-java/api/ diff --git a/debian/libtrove-java.jlibs b/debian/libtrove-java.jlibs new file mode 100644 index 0000000..293d86d --- /dev/null +++ b/debian/libtrove-java.jlibs @@ -0,0 +1 @@ +output/lib/trove-*.jar diff --git a/debian/rules b/debian/rules index 63bcb74..c7f6b29 100755 --- a/debian/rules +++ b/debian/rules @@ -1,22 +1,7 @@ #!/usr/bin/make -f -# debian/rules file for trove (uses cdbs) -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +%: + dh $@ --with javahelper -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jar javadoc - -cleanbuilddir:: - $(RM) -r output - -binary-post-install/libtrove-java:: - dh_install -plibtrove-java \ - output/lib/trove-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/ - dh_link -plibtrove-java \ - /usr/share/java/trove-$(DEB_UPSTREAM_VERSION).jar \ - /usr/share/java/trove.jar - -binary-post-install/libtrove-java-doc:: - dh_install -plibtrove-java-doc \ - output/javadocs/* /usr/share/doc/libtrove-java-doc/api +override_dh_auto_build: + dh_auto_build -- jar javadoc -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/trove.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
