This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit c04843d4bb5cacb6d3ce734e9d62001f06973735 Author: Emmanuel Bourg <[email protected]> Date: Thu May 7 11:49:59 2015 +0200 Renamed T_VER to VERSION in debian/rules --- debian/changelog | 1 + debian/rules | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e817dc0..5622415 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ tomcat8 (8.0.22-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]> Thu, 07 May 2015 08:34:56 +0200 diff --git a/debian/rules b/debian/rules index 826ae60..95a101a 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,7 @@ JAVA_HOME := /usr/lib/jvm/default-java BLDLIB := output/build/lib # Upstream version -T_VER := $(shell dpkg-parsechangelog | egrep '^Version:' \ - | cut -f 2 -d ' ' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//' | sed 's/~/-/') +VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//' | sed 's/~/-/') # root webapp file locations (during the build) RWLOC := debian/default_root @@ -53,15 +52,15 @@ override_dh_install-indep: mkdir -p debian/poms cp res/maven/*.pom debian/poms - perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(T_VER)/' debian/poms/*.pom + perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(VERSION)/' debian/poms/*.pom mh_install -plibservlet3.1-java mh_install -plibtomcat8-java # Install catalina-storeconfig.jar (no pom available) - mv $(BLDLIB)/catalina-storeconfig.jar $(BLDLIB)/tomcat8-catalina-storeconfig-$(T_VER).jar - 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 + mv $(BLDLIB)/catalina-storeconfig.jar $(BLDLIB)/tomcat8-catalina-storeconfig-$(VERSION).jar + dh_install -plibtomcat8-java $(BLDLIB)/tomcat8-catalina-storeconfig-$(VERSION).jar usr/share/java + dh_link -plibtomcat8-java usr/share/java/tomcat8-catalina-storeconfig-$(VERSION).jar usr/share/java/tomcat8-catalina-storeconfig.jar rm -r debian/poms rm -rf \ -- 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
