Bug#650656: tomcat6: Error in debian/rules causes tomcat to report no version

Package: tomcat6
Version: 6.0.28-9+squeeze1
Severity: normal
Tags: patch

Hello,

The tomcat6 packaged in debian reports no version. This can be seen executing:
$ /usr/share/tomcat6/bin/version.sh

Which results in:

Using CATALINA_BASE: /usr/share/tomcat6
Using CATALINA_HOME: /usr/share/tomcat6
Using CATALINA_TMPDIR: /usr/share/tomcat6/temp
Using JRE_HOME: /usr
Using CLASSPATH: /usr/share/tomcat6/bin/bootstrap.jar
Server version: Apache Tomcat/6.0.28
Server built: February 12 2011 1443
Server number: ...0
OS Name: Linux
OS Version: 2.6.32-5-amd64
Architecture: amd64
JVM Version: 1.6.0_18-b18
JVM Vendor: Sun Microsystems Inc.

The server number should contain "6.0.28.0".

This doesn't seem to affect functionality, but it does affect the integration of
tomcat with other development tools. For example, netbeans 7.0.1 refuses to
use this tomcat installation to deploy webapps as it can't determine the
version.

I've dug into it and found that the version number is fed to the build system
in the ant command line in the debian/rules script. The version is read from
the changelog, but then it's wrongly parsed into major/minor/build versions.

I've attached the patch I used to solve it.

I can confirm this happens in the tomcat6 packages in both squeeze and wheezy,
as well as in the tomcat7 packages from unstable and testing. I'll file another
bug report against it if needed.

Jorge Barreiro González
aCore
jbarreiro@acore.es
http://www.acore.es
Tel. 881 927 189

name="tomcat6-debian-patch"
filename="tomcat6-debian-patch"

debian/rules 2011-12-01 17:11:19.000000000 +0100
+++ debian/rules 2011-12-01 13:52:41.000000000 +0100
@@ -21,9 +21,9 @@
| 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 \




To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org