[libdb-je-java] 17/22: Build with the DH sequencer instead of CDBS

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libdb-je-java.

commit c2b99136fc3e52180bfcdd61383609464ed45bd4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 22 12:41:14 2017 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/control   |  1 -
 debian/rules     | 22 +++++++++-------------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 657307b..ee43190 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdb-je-java (3.3.98-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index f2135ab..95c91e5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders:
  Varun Hiremath <varun at debian.org>,
  Torsten Werner <twerner at debian.org>
 Build-Depends:
- cdbs,
  debhelper (>= 10),
  ant,
  default-jdk,
diff --git a/debian/rules b/debian/rules
index a29cb28..2155333 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+export CLASSPATH=/usr/share/java/glassfish-javaee.jar
 
-JAVA_HOME 		:= /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET	:= jar
-DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_JARS		:= glassfish-javaee
+%:
+	dh $@
 
-install/libdb-je-java::
-	install -m 644 -D db-je.jar $(DEB_DESTDIR)/usr/share/java/db-je-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/db-je-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/db-je.jar
+override_dh_auto_build:
+	dh_auto_build -- -f debian/build.xml jar
 
-binary-predeb/libdb-je-java::
-	# remove empty directories
-	find  $(DEB_DESTDIR) -type 'd' -empty -delete
+override_dh_auto_install:
+	dh_install db-je.jar $(DEB_DESTDIR)/usr/share/java/db-je-$(DEB_VERSION_UPSTREAM).jar
+	dh_link /usr/share/java/db-je-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/db-je.jar
 
 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/libdb-je-java.git