This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat7.
commit fd8d75e731db48cf63f63a505758e1815c84765d Author: Emmanuel Bourg <[email protected]> Date: Wed May 27 10:41:46 2015 +0200 Removed the RWFILES and RWLOC variables --- debian/changelog | 1 + debian/rules | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5351e60..dbb5f34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ tomcat7 (7.0.61-2) UNRELEASED; urgency=medium - Do not set the version.* properties already defined in build.properties.default - Renamed T_VER to VERSION + - Removed the RWFILES and RWLOC variables - No longer remove the long gone .svn directories under /usr/share/tomcat8/webapps/default_root - Let dh_fixperms set the permissions instead of calling chmod +x diff --git a/debian/rules b/debian/rules index 8f66d74..bf04a25 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,6 @@ VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//' T_JARS := tomcat-i18n-fr tomcat-i18n-es tomcat-i18n-ja catalina-ant T_MAVENIZED_JARS := jasper-el annotations-api jasper catalina-ha catalina -# root webapp file locations (during the build) -RWLOC := debian/default_root -RWFILES := $(RWLOC)/index.html $(RWLOC)/META-INF/context.xml - # Add distribution.name as system property to grab it when showing version TOMCAT7_DISTRIBUTION := "$(shell lsb_release -si)" @@ -125,7 +121,7 @@ override_dh_install-indep: # update the checksum for the root webapp unset rwmd5sum \ - && rwmd5sum=`cat $(RWFILES) | md5sum - 2>/dev/null | cut -d " " -f1` \ + && 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/tomcat7.postrm.in > debian/tomcat7.postrm jh_manifest -- 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
