[tomcat8] 05/16: 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 tomcat8.

commit c3766c2c0f79d58c3442656d0af917e72d269b15
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 7 11:30:34 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index b21eed4..e817dc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ tomcat8 (8.0.22-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>  Thu, 07 May 2015 08:34:56 +0200
 
diff --git a/debian/rules b/debian/rules
index 7ac23e4..826ae60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,6 @@ BLDLIB := output/build/lib
 T_VER := $(shell dpkg-parsechangelog | egrep '^Version:' \
 	| cut -f 2 -d ' ' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//' | sed 's/~/-/')
 
-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
 RWFILES := $(RWLOC)/index.html $(RWLOC)/META-INF/context.xml
@@ -18,13 +14,7 @@ RWFILES := $(RWLOC)/index.html $(RWLOC)/META-INF/context.xml
 # Add distribution.name as system property to grab it when showing version
 TOMCAT_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=$(TOMCAT_DISTRIBUTION) \
-	-Dversion.suffix=""
+ANT_ARGS := -Ddistribution.name=$(TOMCAT_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/tomcat8.git