[tomcat8] 02/16: Modified debian/rules to use the dh sequencer

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 320fea0adcee8b3ec3f9b4a74f8582fb8090eae0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 7 10:02:13 2015 +0200

    Modified debian/rules to use the dh sequencer
---
 debian/changelog |  7 +++++++
 debian/rules     | 52 ++++++++++------------------------------------------
 2 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dee4bb8..457d6e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat8 (8.0.22-2) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - Modified to use the dh sequencer
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 07 May 2015 08:34:56 +0200
+
 tomcat8 (8.0.22-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 808d44f..3bbc099 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,11 +48,11 @@ ANT_ARGS := -Dcompile.debug=true \
 
 ANT_INVOKE := $(JAVA_CMD) -classpath "$(DEB_CLASSPATH)" org.apache.tools.ant.Main $(ANT_ARGS)
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
+
+%:
+	dh $@
+
+override_dh_auto_build:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	mkdir -p webapps/examples/WEB-INF/lib
 	cp /usr/share/java/jstl1.1.jar webapps/examples/WEB-INF/lib/jstl.jar
@@ -65,35 +65,19 @@ endif
 		-sourcepath "java" -author -version -breakiterator -notimestamp \
 		-windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \
 		-bottom "Copyright © 2000-2014 The Apache Software Foundation. All Rights Reserved."
-	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
+override_dh_auto_clean:
+	dh_auto_clean
 	-$(ANT_INVOKE) clean
 	rm -rf "output/"
 	rm -rf webapps/examples/WEB-INF/lib/*.jar
-	rm -f build-stamp modules/jdbc-pool/output/resources/MANIFEST.MF
+	rm -f modules/jdbc-pool/output/resources/MANIFEST.MF
 	rm -f debian/tomcat8.postrm
-	dh_clean
 	mh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep 
-	dh_installdirs
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
+override_dh_install-indep:
+	dh_install -i --exclude=.bat --exclude=Thumbs.db
 	dh_installman -ptomcat8-user debian/tomcat8-instance-create.1
-	dh_installexamples
-	dh_installinit --error-handler=true -- defaults 92 08
-	dh_installdebconf
-	dh_installcron
 	
 	mkdir -p debian/poms
 	cp res/maven/*.pom debian/poms
@@ -107,9 +91,6 @@ binary-indep: build install
 	dh_install -plibtomcat8-java $(BLDLIB)/tomcat8-catalina-storeconfig-$(T_VER).jar      usr/share/java
 	dh_link -plibtomcat8-java    usr/share/java/tomcat8-catalina-storeconfig-$(T_VER).jar usr/share/java/tomcat8-catalina-storeconfig.jar
 	
-	dh_install --exclude=.bat --exclude=Thumbs.db
-	dh_link
-	
 	rm -r debian/poms
 	rm -rf \
            debian/tomcat8/usr/share/tomcat8/webapps/default_root/.svn \
@@ -124,19 +105,6 @@ binary-indep: build install
 		&& sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat8.postrm.in > debian/tomcat8.postrm
 	
 	jh_manifest
-	dh_compress
-	dh_fixperms
-	dh_lintian
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
 
 get-orig-source:
 	-uscan --force-download --rename
-
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source

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