The following commit has been merged in the master branch:
commit 5376b6c6cf5a9d058899af14daa87eda49809244
Author: Miguel Landaeta <mig...@miguel.cc>
Date: Fri Dec 9 18:48:27 2011 -0430
Fix error that caused tomcat to report no version
diff --git a/debian/changelog b/debian/changelog
index abb1cbc..00738ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
tomcat7 (7.0.23-2) UNRELEASED; urgency=low
+ [ tony mancill ]
* Add nl.po debconf translation (Closes: #651162)
- Thanks to Jeroen Schot
- -- tony mancill <tmanc...@debian.org> Tue, 06 Dec 2011 23:49:52 -0800
+ [ Miguel Landaeta ]
+ * Fix error in debian/rules that caused tomcat to report no version.
+ Thanks to Jorge Barreiro for the patch. (Closes: #651492).
+
+ -- Miguel Landaeta <mig...@miguel.cc> Fri, 09 Dec 2011 17:42:57 -0430
tomcat7 (7.0.23-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 43f1c3f..5caddcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,9 @@ 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 := $(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 \
--
tomcat7: Servlet and JSP engine
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
