[aether] 02/04: Build with the DH sequencer instead of CDBS
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Feb 12 09:56:02 GMT 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository aether.
commit 4ee4345dbb636bc77a5f8b9d8e4c68a11f062089
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Feb 12 10:46:33 2016 +0100
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/control | 2 +-
debian/rules | 8 +++-----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 78537ad..9774ea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ aether (1.13.1-3) UNRELEASED; urgency=medium
- Use canonical URLs for the Vcs-* fields
- Standards-Version updated to 3.9.7 (no changes)
* Removed the unused files debian/libaether-java-doc.*
+ * Build with the DH sequencer instead of CDBS
* Switch to debhelper level 9
-- Emmanuel Bourg <ebourg at apache.org> Tue, 30 Sep 2014 16:32:33 +0200
diff --git a/debian/control b/debian/control
index 048116e..c677103 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
Build-Depends-Indep: junit4,
libasync-http-client-java,
libplexus-classworlds2-java,
diff --git a/debian/rules b/debian/rules
index b76c54a..d755df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+ dh $@ --buildsystem=maven
get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+ uscan --download-current-version --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/aether.git
More information about the pkg-java-commits
mailing list