[jdeb] 01/07: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Jan 18 13:38:01 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jdeb.

commit 2e53295cfab58faf425c5295f4f11a12e73b4fbb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 18 14:15:02 2016 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  7 +++++++
 debian/control   |  2 --
 debian/rules     | 11 ++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5334256..0f00fbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jdeb (1.0.2~git20130829-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 18 Jan 2016 14:14:43 +0100
+
 jdeb (1.0.2~git20130829-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 1a093fa..7eb7e22 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Steffen Moeller <moeller at debian.org>,
  Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 9),
- cdbs,
  default-jdk,
  maven-debian-helper (>= 1.5)
 Build-Depends-Indep: libmaven-invoker-plugin-java,
@@ -32,4 +31,3 @@ Description: utility to construct Debian packages from Ant or Maven
  from Java builds in a truly cross platform manner. Build your Debian packages
  on any platform that has Java support. Windows, Linux, OS X - it doesn't
  require additional native tools installed.
-
diff --git a/debian/rules b/debian/rules
index 41e84a0..1a93b2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,12 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME = /usr/lib/jvm/default-java
 
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven
 
-DEB_INSTALL_CHANGELOGS_ALL := HISTORY.md
+override_dh_installchangelogs:
+	dh_installchangelogs -- HISTORY.md
 
 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/jdeb.git



More information about the pkg-java-commits mailing list