[tomcat7] 04/13: Do not set the version.* properties already defined in build.properties.default

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat7.

commit 524ed1bbdb73daf17c94cb48e7929b12c6139877
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 27 09:29:31 2015 +0200

    Do not set the version.* properties already defined in build.properties.default
---
 debian/changelog |  2 ++
 debian/rules     | 11 +----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3d9219..7307338 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ tomcat7 (7.0.61-2) UNRELEASED; urgency=medium
     - Modified to use the dh sequencer
     - Simplified the ant invocation and moved some properties
       to debian/ant.properties
+    - Do not set the version.* properties already defined
+      in build.properties.default
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 27 May 2015 09:10:20 +0200
 
diff --git a/debian/rules b/debian/rules
index fa03f0d..052307b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,6 @@ T_VER := $(shell dpkg-parsechangelog | egrep '^Version:' \
 	| cut -f 2 -d ' ' | cut -f 2 -d ' '|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
-T_VER_MAJOR := $(shell echo $(T_VER) | cut -d'.' -f1)
-T_VER_MINOR := $(shell echo $(T_VER) | cut -d'.' -f2)
-T_VER_BUILD := $(shell echo $(T_VER) | cut -d'.' -f3)
 
 # root webapp file locations (during the build)
 RWLOC := debian/default_root
@@ -19,13 +16,7 @@ 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)"
 
-ANT_ARGS := -Dversion=$(T_VER) \
-    -Dversion.major="$(T_VER_MAJOR)" \
-    -Dversion.minor="$(T_VER_MINOR)" \
-    -Dversion.build="$(T_VER_BUILD)" \
-    -Dversion.patch="0" \
-    -Ddistribution.name=$(TOMCAT7_DISTRIBUTION) \
-    -Dversion.suffix="" 
+ANT_ARGS := -Ddistribution.name=$(TOMCAT7_DISTRIBUTION)
 
 ANT_INVOKE := ant $(ANT_ARGS) -propertyfile debian/ant.properties
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git