This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat7.
commit 054bbf5dd22aee8fe9732c831b2af0124f55a183 Author: Emmanuel Bourg <[email protected]> Date: Wed May 27 09:10:44 2015 +0200 Modified debian/rules to use the dh sequencer --- debian/changelog | 7 +++++++ debian/rules | 52 +++++++++++----------------------------------------- 2 files changed, 18 insertions(+), 41 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12be1df..cf15f36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tomcat7 (7.0.61-2) UNRELEASED; urgency=medium + + * debian/rules: + - Modified to use the dh sequencer + + -- Emmanuel Bourg <[email protected]> Wed, 27 May 2015 09:10:20 +0200 + tomcat7 (7.0.61-1) unstable; urgency=medium * Upload to unstable diff --git a/debian/rules b/debian/rules index 3801ff8..eff12cd 100755 --- a/debian/rules +++ b/debian/rules @@ -55,11 +55,10 @@ endif 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 @@ -72,35 +71,19 @@ endif -sourcepath "java" -author -version -breakiterator -notimestamp \ -windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \ -bottom "Copyright © 2000-2013 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/tomcat7.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 -ptomcat7-user debian/tomcat7-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 perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/' \ @@ -161,8 +144,7 @@ binary-indep: build install usr/share/java/$$i.jar && \ dh_link -ptomcat7-common usr/share/java/$$i-$(T_VER).jar \ usr/share/tomcat7/lib/$$i.jar; done - dh_install --exclude=.bat --exclude=Thumbs.db - dh_link + mh_installpoms -plibservlet3.0-java mh_installjar -plibservlet3.0-java -l -s \ debian/poms/tomcat-servlet-api.pom \ @@ -194,18 +176,6 @@ binary-indep: build install && rwmd5sum=`cat $(RWFILES) | md5sum - 2>/dev/null | cut -d " " -f1` \ && sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat7.postrm.in > debian/tomcat7.postrm jh_manifest - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: build install - -binary: binary-indep binary-arch get-orig-source: -uscan --download-version $(T_VER) --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/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
