[med-svn] [biojava-live] 02/09: Replace cdbs variables by those provided by /usr/share/dpkg/default.mk

[Andreas Tille]

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

tille pushed a commit to branch master
in repository biojava-live.

commit 92b4dc1972a1055f20bdc4006608978c93190f9c
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 26 10:35:36 2017 +0200

    Replace cdbs variables by those provided by /usr/share/dpkg/default.mk
---
 debian/changelog |  1 +
 debian/control   |  1 -
 debian/rules     | 19 +++++++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2fb43d..20e9b74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ biojava-live (1:1.7.1-6) UNRELEASED; urgency=medium
 
   * Moved packaging to Git
   * cme fix dpkg-control
+  * Replace cdbs variables by those provided by /usr/share/dpkg/default.mk
 
  -- Andreas Tille <tille at debian.org>  Tue, 26 Sep 2017 10:16:32 +0200
 
diff --git a/debian/control b/debian/control
index e527d49..94b7ac1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
 Section: java
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               cdbs,
                ant
 Build-Depends-Indep: libcommons-dbcp-java,
                      libhsqldb-java,
diff --git a/debian/rules b/debian/rules
index 929f2e4..aaeda79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,15 @@
 
 # include series of variables to become more version-independent
 # in this debian/rules file.
-include /usr/share/cdbs/1/rules/buildvars.mk
+include /usr/share/dpkg/default.mk
 
-export JAVA_HOME := $(shell /usr/sbin/update-java-alternatives -l | head -1 | cut -d' ' -f 3)
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 # version are the first two decimals
-SOVERSION=$(shell echo $(DEB_UPSTREAM_VERSION) | cut -f1,2 -d. )
+SOVERSION=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -f1,2 -d. )
+
+%:
+	dh $@  --with javahelper
 
 build: build-stamp
 
@@ -46,7 +49,7 @@ install: build
 	dh_prep
 	dh_installdirs
 
-	cp ant-build/biojava.jar $(CURDIR)/debian/libbiojava$(SOVERSION)-java/usr/share/java/biojava$(DEB_UPSTREAM_VERSION).jar
+	cp ant-build/biojava.jar $(CURDIR)/debian/libbiojava$(SOVERSION)-java/usr/share/java/biojava$(DEB_VERSION_UPSTREAM).jar
 	d=$(CURDIR)/debian/libbiojava-java-doc/usr/share/doc/libbiojava-java/api; \
 	[ -d $$d ] || mkdir -p $$d ; \
 	cp -r ant-build/docs/biojava/* $$d
@@ -69,11 +72,11 @@ binary-indep: build install
 	dh_installdocs
 	dh_installexamples -plibbiojava-java-demos demos/*
 	#dh_installman
-	dh_link -p libbiojava-java /usr/share/java/biojava$(DEB_UPSTREAM_VERSION).jar /usr/share/java/biojava.jar
+	dh_link -p libbiojava-java /usr/share/java/biojava$(DEB_VERSION_UPSTREAM).jar /usr/share/java/biojava.jar
 	# thinking about svn snapshots
-	if [ "$(SOVERSION)" != "$(DEB_UPSTREAM_VERSION)" ]; then \
+	if [ "$(SOVERSION)" != "$(DEB_VERSION_UPSTREAM)" ]; then \
 		dh_link -p libbiojava$(SOVERSION)-java \
-			   /usr/share/java/biojava$(DEB_UPSTREAM_VERSION).jar \
+			   /usr/share/java/biojava$(DEB_VERSION_UPSTREAM).jar \
 			   /usr/share/java/biojava$(SOVERSION).jar; \
 	fi
 	dh_link # use <pkg>.link files for version independant linking
@@ -87,7 +90,7 @@ binary-indep: build install
 binary: binary-indep binary-arch
 
 get-orig-source:
-	version=$(DEB_UPSTREAM_VERSION).svn.`date +"%Y%m%d"|tr -d '\n'` ; \
+	version=$(DEB_VERSION_UPSTREAM).svn.`date +"%Y%m%d"|tr -d '\n'` ; \
 	targetdir=biojava-live-$$version ; \
 	origtargz=biojava-live_$$version.orig.tar.gz ; \
 	cd .. ; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/biojava-live.git