[med-svn] [biojava-live] 03/09: d/rules: use dh

[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 0ad1ad6f26ff3eb031336d6d98cabb29e62ec4d0
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 26 10:51:41 2017 +0200

    d/rules: use dh
---
 debian/changelog |  1 +
 debian/rules     | 42 +++++++++++-------------------------------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20e9b74..830c4a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,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
+  * d/rules: use dh
 
  -- Andreas Tille <tille at debian.org>  Tue, 26 Sep 2017 10:16:32 +0200
 
diff --git a/debian/rules b/debian/rules
index aaeda79..f4041e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,8 @@ SOVERSION=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -f1,2 -d. )
 %:
 	dh $@  --with javahelper
 
-build: build-stamp
-
-build-stamp:
-	dh_testdir
+override_dh_auto_build:
+	dh_auto_build
 	find . -name "*.java" -o -name ReadMe -o -name "*.fa" -o -name "*.html" | xargs -r chmod 644 
 	# circumvent Debian's difficulties with libjgrapht - deleting all usage of that library
 	rm -rf src/org/biojavax/bio/phylo/io/nexus/ \
@@ -33,21 +31,12 @@ build-stamp:
 
 	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	# Add here commands to clean up after the build process.
-	ant clean
-
+override_dh_clean:
+	ant clean # most probably this is not needed when using dh - leave it to be sure ...
 	dh_clean 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+override_dh_install:
+	dh_install
 
 	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; \
@@ -61,17 +50,17 @@ install: build
 
 	ant runtests
 
-
-binary-arch:
-# We have nothing to do by default.
-
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
+
+override_dh_installexamples:
+	dh_installexamples
 	dh_installexamples -plibbiojava-java-demos demos/*
-	#dh_installman
+
+override_dh_link:
 	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_VERSION_UPSTREAM)" ]; then \
@@ -80,14 +69,7 @@ binary-indep: build install
 			   /usr/share/java/biojava$(SOVERSION).jar; \
 	fi
 	dh_link # use <pkg>.link files for version independant linking
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
 
 get-orig-source:
 	version=$(DEB_VERSION_UPSTREAM).svn.`date +"%Y%m%d"|tr -d '\n'` ; \
@@ -99,5 +81,3 @@ get-orig-source:
 	find $$targetdir -name "*.jar" | xargs -r rm  ; \
 	tar czf $$origtargz $$targetdir ; \
 	rm -rf $$targetdir
-
-.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source

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