[libnanoxml2-java] 01/06: Short dh

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libnanoxml2-java.

commit ea5c9bacca0473a666e2a278bb6555b4fd732442
Author: Andreas Tille <tille at debian.org>
Date:   Wed Dec 23 19:01:54 2015 +0100

    Short dh
---
 debian/rules | 57 +++++++--------------------------------------------------
 1 file changed, 7 insertions(+), 50 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2972c5e..6359a12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
-#
-# Modified by Sveinung Kvilhaugsvik. Any changes I have done are hereby
-# released under the GPL or the license of nanoxml as stated in copyright
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
@@ -28,10 +16,10 @@ NANOXML := nanoxml.jar
 LITE := nanoxml-lite.jar
 SAX := nanoxml-sax.jar
 
-#Architecture
-build: build-stamp
+%:
+	dh $@ --with javahelper
 
-build-stamp:
+override_dh_auto_build:
 	jh_build -o'${JFLAGS}' -N ${LITE} Sources/Lite/
 	jh_build -o'${JFLAGS}' -N ${NANOXML} Sources/Java/
 	CLASSPATH=${NANOXML} jh_build -o'${JFLAGS}' -N ${SAX} Sources/SAX/
@@ -47,17 +35,14 @@ build-stamp:
 	${JAVA_HOME}/bin/javadoc -author -link /usr/share/doc/default-jdk-doc/api -quiet \
 	-sourcepath Sources/Java/:Sources/Lite/:Sources/SAX/ -source 1.4 \
 	nanoxml net.n3.nanoxml net.n3.nanoxml.sax -d api
+
+override_dh_auto_test:
 	if [ $(filter nocheck, $(DEB_BUILD_OPTIONS)) ]; \
 		then	echo "Disabeling tests"; \
 		else	make -f debian/rules test; \
 	fi;
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp test
 
+override_dh_clean:
 	jh_clean
 	rm ${SAX} ${NANOXML} ${LITE} *.bar || echo "no jars to remove"
 	rm -rf api
@@ -66,39 +51,11 @@ clean:
 
 	dh_clean
 
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i
-
+override_dh_install:
 	jh_installlibs -i
 	jh_installjavadoc -plibnanoxml2-java-doc
 	dh_install -i
 
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch:
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary install
 
 test:
 	set -e

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnanoxml2-java.git