This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat7.
commit 21050b3321e85f496fde9dd6150feb4ce68bc8b3 Author: Emmanuel Bourg <[email protected]> Date: Wed May 27 09:43:19 2015 +0200 Renamed T_VER to VERSION in debian/rules --- debian/changelog | 1 + debian/rules | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7307338..c091cb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ tomcat7 (7.0.61-2) UNRELEASED; urgency=medium to debian/ant.properties - Do not set the version.* properties already defined in build.properties.default + - Renamed T_VER to VERSION -- Emmanuel Bourg <[email protected]> Wed, 27 May 2015 09:10:20 +0200 diff --git a/debian/rules b/debian/rules index 052307b..1a4e554 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,7 @@ export JAVA_HOME := /usr/lib/jvm/default-java BLDLIB := output/build/lib BLDBIN := output/build/bin -T_VER := $(shell dpkg-parsechangelog | egrep '^Version:' \ - | cut -f 2 -d ' ' | cut -f 2 -d ' '|sed 's/-[^-]*$$//') +VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//' | 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 @@ -67,7 +66,7 @@ override_dh_install-indep: debian/poms/tomcat-jsp-api.pom perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.2/' \ debian/javaxpoms/jsp-api.pom - perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(T_VER)/' \ + perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(VERSION)/' \ debian/poms/*.pom mh_installpoms -plibtomcat7-java for i in $(T_MAVENIZED_JARS); \ @@ -106,12 +105,12 @@ override_dh_install-indep: usr/share/tomcat7/lib/catalina-jmx-remote.jar for i in $(T_JARS); do \ - mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \ + mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(VERSION).jar && \ dh_install -plibtomcat7-java \ - $(BLDLIB)/$$i-$(T_VER).jar usr/share/java && \ - dh_link -plibtomcat7-java usr/share/java/$$i-$(T_VER).jar \ + $(BLDLIB)/$$i-$(VERSION).jar usr/share/java && \ + dh_link -plibtomcat7-java usr/share/java/$$i-$(VERSION).jar \ usr/share/java/$$i.jar && \ - dh_link -ptomcat7-common usr/share/java/$$i-$(T_VER).jar \ + dh_link -ptomcat7-common usr/share/java/$$i-$(VERSION).jar \ usr/share/tomcat7/lib/$$i.jar; done mh_installpoms -plibservlet3.0-java @@ -147,4 +146,4 @@ override_dh_install-indep: jh_manifest get-orig-source: - -uscan --download-version $(T_VER) --force-download --rename + -uscan --download-version $(VERSION) --force-download --rename -- 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
