This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch experimental in repository tomcat8.
commit de6b2a6954a09b2e4cbd3d7e4c9aadc12a18606c Author: Emmanuel Bourg <[email protected]> Date: Wed Nov 30 17:14:28 2016 +0100 Simplified debian/rules --- debian/changelog | 1 + debian/clean | 5 +++++ debian/rules | 22 +++++++--------------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3ad1bd..d5bc2d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ tomcat8 (8.5.8-2) UNRELEASED; urgency=medium * Team upload. * Set the proper permissions for /etc/tomcat8/jaspic-providers.xml * Install the Maven artifacts for tomcat-storeconfig + * Simplified debian/rules -- Emmanuel Bourg <[email protected]> Wed, 30 Nov 2016 16:35:02 +0100 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..a34277d --- /dev/null +++ b/debian/clean @@ -0,0 +1,5 @@ +output/ +webapps/examples/WEB-INF/lib/*.jar +debian/tomcat8.postrm +debian/tomcat8-user.NEWS +debian/poms/ diff --git a/debian/rules b/debian/rules index f4d17c0..ea7abf3 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ ANT := ant -propertyfile debian/ant.properties \ -Ddistribution.name=$(shell lsb_release -si) %: - dh $@ + dh $@ --with maven-repo-helper --with javahelper override_dh_auto_build: $(ANT) extras-jmx-remote deploy embed-jars @@ -23,6 +23,11 @@ override_dh_auto_build: -windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \ -bottom "Copyright © 2000-2015 The Apache Software Foundation. All Rights Reserved." + # Prepare the Maven artifacts + mkdir -p debian/poms + cp res/maven/*.pom debian/poms + perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(VERSION)/' debian/poms/*.pom + override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) mkdir -p webapps/examples/WEB-INF/lib @@ -37,28 +42,15 @@ override_dh_installchangelogs: override_dh_install-indep: dh_install -i --exclude=.bat --exclude=Thumbs.db - - # Prepare and install the Maven artifacts - mkdir -p debian/poms - cp res/maven/*.pom debian/poms - perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(VERSION)/' debian/poms/*.pom - mh_install - + # update the checksum for the root webapp unset rwmd5sum \ && rwmd5sum=`cat debian/default_root/index.html debian/default_root/META-INF/context.xml | md5sum - 2>/dev/null | cut -d " " -f1` \ && sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat8.postrm.in > debian/tomcat8.postrm - - jh_manifest override_dh_auto_clean: dh_auto_clean -$(ANT) clean - rm -rf "output/" - rm -rf webapps/examples/WEB-INF/lib/*.jar - rm -f modules/jdbc-pool/output/resources/MANIFEST.MF - rm -rf debian/tomcat8.postrm debian/tomcat8-user.NEWS debian/poms - mh_clean get-orig-source: -uscan --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
