[SCM] tomcat6 packaging branch, master, updated. debian/6.0.33-1-5-g00b0a41

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 00b0a412870d13c9090ee6501c041c7ba709aa27
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Thu Dec 8 22:19:12 2011 -0430

    Fix error that caused tomcat to report no version

diff --git a/debian/changelog b/debian/changelog
index 4f3c354..d5c0309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-tomcat6 (6.0.35-1~miguel1) UNRELEASED; urgency=low
+tomcat6 (6.0.35-1) UNRELEASED; urgency=low
 
   [ Miguel Landaeta ]
   * New upstream release.
   * Add myself to Uploaders.
   * Remove 0013-CVE-2011-3190.patch since it was included upstream.
   * Add mh_clean call in clean target.
+  * Fix error in debian/rules that caused tomcat to report no version.
+    Thanks to Jorge Barreiro for the patch. (Closes: #650656).
 
   [ tony mancill ]
   * Update Vcs-* fields in debian/control for switch to git.
diff --git a/debian/rules b/debian/rules
index dbda264..228dd24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,9 @@ T_VER := $(shell dpkg-parsechangelog | egrep '^Version:' \
 T_JARS := tomcat-i18n-fr tomcat-i18n-es tomcat-i18n-ja catalina-ant
 T_EXTRAS_JARS := catalina-jmx-remote
 T_MAVENIZED_JARS := jasper-el annotations-api jasper catalina-ha catalina
-T_VER_MAJOR := $(echo $(T_VER) | cut -d'.' -f1)
-T_VER_MINOR := $(echo $(T_VER) | cut -d'.' -f2)
-T_VER_BUILD := $(echo $(T_VER) | cut -d'.' -f3)
+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)
 
 ANT_ARGS := -Dcompile.debug=true \
 	-Dant.build.javac.source=1.5 \

-- 
tomcat6 packaging