[resteasy] 03/04: Build with the DH sequencer instead of CDBS
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sat Apr 16 20:56:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository resteasy.
commit a1b781eb94df4623d58eb00fb7ed3bf45d6e3c33
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Apr 16 22:47:36 2016 +0200
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/control | 2 +-
debian/rules | 10 +++-------
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 54f9668..49b4c43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
resteasy (3.0.6-4) UNRELEASED; urgency=medium
* Team upload.
+ * Build with the DH sequencer instead of CDBS
* Standards-Version updated to 3.9.8 (no changes)
* Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index 86e685d..fc6a7ec 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: Timo Aaltonen <tjaalton at debian.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
Build-Depends-Indep:
glassfish-javaee,
javahelper,
diff --git a/debian/rules b/debian/rules
index 4c3177c..d4bd8dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
+%:
+ dh $@ --buildsystem=maven --with javahelper
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/resteasy.git
More information about the pkg-java-commits
mailing list