[latexdraw] 109/147: Change to dh7 rules

[Stuart Prescott]

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

stuart pushed a commit to branch master
in repository latexdraw.

commit 66173886a6f2282785e90d44bb61259a22e25e47
Author: Stuart Prescott <stuart at debian.org>
Date:   Thu Jan 13 21:26:25 2011 +0000

    Change to dh7 rules
---
 debian/control |  2 +-
 debian/rules   | 51 ++++++++-------------------------------------------
 2 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/debian/control b/debian/control
index 0f3c8a4..a325c8b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: latexdraw
 Section: graphics
 Priority: optional
 Maintainer: Stuart Prescott <stuart+debian at nanonanonano.net>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7.3.5~)
 Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk,
                      ant,
                      imagemagick,
diff --git a/debian/rules b/debian/rules
index 866d270..4338cd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,66 +14,32 @@ JAVA_HOME ?= $(shell echo \
  )
 export JAVA_HOME
 
-build: build-stamp
+%:
+	dh $@
 
-build-stamp:
-	dh_testdir
+override_dh_auto_build:
 	ant -Dlib.dir=/usr/share/java compile
 	ant -Dlib.dir=/usr/share/java jar
 	convert -geometry 32x32 res/LaTeXDrawIcon.png out/latexdraw32.xpm
 	convert -geometry 16x16 res/LaTeXDrawIcon.png out/latexdraw16.xpm
-	touch $@
 
-clean:
-	dh_testdir
-	dh_testroot
+override_dh_autoclean:
 	rm -f build-stamp
 	find . -name \*.jar -exec rm -f {} \;
 	find . -name \*.class -exec rm -f {} \;
 	rm -rf out/ api/
-	dh_clean 
+	dh_clean
 
 # A target for building the API docs with javadoc is provided here
 # but is not actually used in the Debian package. To successfully
-# build the API documentation, the packages 
+# build the API documentation, the packages
 #         libjiu-java-doc, libjlibeps-java-doc
 # must be installed too.
 apidocs: build
 	ant -Dlib.dir=/usr/share/java doc
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-
-# Build architecture-dependent files here.
-binary-arch:
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	
-	dh_installchangelogs 
+override_dh_installchangelogs:
 	dh_installchangelogs -k release_note.txt
-	dh_installdocs
-	dh_install
-	# dh_installmenu isn't required for squeeze/sid but makes backporting to lenny
-	# even easier; triggers lintian warning but dh_installmenu is a harmless noop
-	# W: latexdraw source: dh_desktop-is-deprecated
-	dh_installmenu
-	dh_installmime
-	dh_desktop
-	dh_installman
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
 
 # Be explicit given that there is plenty of confusion about what this target means
 get-orig-source: get-latest-source
@@ -86,5 +52,4 @@ get-latest-source:
 	echo debian/repackage --upstream-version "$${uver}" "$${uurl}" $(CURDIR) &&\
 	sh debian/repackage --upstream-version "$${uver}" "$${uurl}" $(CURDIR)
 
-
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source get-latest-source
+.PHONY: get-orig-source get-latest-source

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