[pkg-java] r11816 - trunk/tomcat6/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2010-03-07 22:24:31 +0000 (Sun, 07 Mar 2010)
New Revision: 11816

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/control
   trunk/tomcat6/debian/maven.rules
   trunk/tomcat6/debian/rules
Log:
* Set the major, minor and build versions when calling Ant (Closes: LP: #495505)
* Rebuild with a more recent version of maven-repo-helper which puts
  the javax jars at the correct location in the Maven repository.
  Fixes several FTBFS in other packages.

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-03-06 22:13:58 UTC (rev 11815)
+++ trunk/tomcat6/debian/changelog	2010-03-07 22:24:31 UTC (rev 11816)
@@ -1,8 +1,11 @@
-tomcat6 (6.0.24-3) unstable; urgency=low
+tomcat6 (6.0.24-3) UNRELEASED; urgency=low
 
-  * Fixed Maven support
+  * Set the major, minor and build versions when calling Ant (Closes: LP: #495505)
+  * Rebuild with a more recent version of maven-repo-helper which puts
+    the javax jars at the correct location in the Maven repository.
+    Fixes several FTBFS in other packages.
 
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 21 Feb 2010 15:44:19 +0100
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 03 Mar 2010 00:10:15 +0100
 
 tomcat6 (6.0.24-2) unstable; urgency=low
 

Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control	2010-03-06 22:13:58 UTC (rev 11815)
+++ trunk/tomcat6/debian/control	2010-03-07 22:24:31 UTC (rev 11816)
@@ -6,7 +6,7 @@
  Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>,
  Niels Thykier <niels at thykier.net>
 Build-Depends: default-jdk, ant-optional, debhelper (>= 7)
-Build-Depends-Indep: maven-repo-helper (>> 1.0), libecj-java
+Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java
 Standards-Version: 3.8.4
 Homepage: http://tomcat.apache.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat6/

Modified: trunk/tomcat6/debian/maven.rules
===================================================================
--- trunk/tomcat6/debian/maven.rules	2010-03-06 22:13:58 UTC (rev 11815)
+++ trunk/tomcat6/debian/maven.rules	2010-03-07 22:24:31 UTC (rev 11816)
@@ -2,3 +2,7 @@
 javax.servlet servlet-api jar 2.5
 javax.servlet.jsp jsp-api jar 2.1
 javax.el el-api jar 2.1
+# Convert tomcat version of the standard apis to the javax apis
+s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/
+s/org.apache.tomcat/javax.servlet.jsp/ jsp-api jar s/.*/2.1/
+s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/

Modified: trunk/tomcat6/debian/rules
===================================================================
--- trunk/tomcat6/debian/rules	2010-03-06 22:13:58 UTC (rev 11815)
+++ trunk/tomcat6/debian/rules	2010-03-07 22:24:31 UTC (rev 11816)
@@ -21,12 +21,20 @@
 	| 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)
 
 ANT_ARGS := -Dcompile.debug=true \
 	-Dant.build.javac.source=1.5 \
 	-Dant.build.javac.target=1.5 \
 	-Djdt.jar=/usr/share/java/ecj.jar \
-	-Dversion=$(T_VER)
+	-Dversion=$(T_VER) \
+    -Dversion.major="$(T_VER_MAJOR)" \
+    -Dversion.minor="$(T_VER_MINOR)" \
+    -Dversion.build="$(T_VER_BUILD)" \
+    -Dversion.patch="0" \
+    -Dversion.suffix=""
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	ANT_ARGS += -Dcompile.optimize=false
@@ -72,18 +80,17 @@
 	dh_installcron
 	mkdir -p debian/poms
 	cp res/maven/*.pom debian/poms
-	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.5/;s/org.apache.tomcat/javax.servlet/' \
-		debian/poms/servlet-api.pom
-	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.1/;s/org.apache.tomcat/javax.el/' \
-		debian/poms/el-api.pom
-	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.1/;s/org.apache.tomcat/javax.servlet.jsp/' \
-		debian/poms/jsp-api.pom
+	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.5/' debian/poms/servlet-api.pom
+	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.1/' debian/poms/el-api.pom
+	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.1/' debian/poms/jsp-api.pom
 	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(T_VER)/' debian/poms/*.pom
 	mh_installpoms -plibtomcat6-java
 	for i in $(T_MAVENIZED_JARS); do \
 		mh_installjar -plibtomcat6-java -l debian/poms/$$i.pom $(BLDLIB)/$$i.jar usr/share/tomcat6/lib/$$i.jar; done
-	mh_installjar -plibtomcat6-java -l --usj-name=catalina-tribes debian/poms/tribes.pom $(BLDLIB)/catalina-tribes.jar usr/share/tomcat6/lib/catalina-tribes.jar
-	mh_installjar -plibtomcat6-java -l --usj-name=tomcat-coyote debian/poms/coyote.pom $(BLDLIB)/tomcat-coyote.jar usr/share/tomcat6/lib/tomcat-coyote.jar
+	mh_installjar -plibtomcat6-java -l --usj-name=catalina-tribes debian/poms/tribes.pom \
+		$(BLDLIB)/catalina-tribes.jar usr/share/tomcat6/lib/catalina-tribes.jar
+	mh_installjar -plibtomcat6-java -l --usj-name=tomcat-coyote debian/poms/coyote.pom \
+		$(BLDLIB)/tomcat-coyote.jar usr/share/tomcat6/lib/tomcat-coyote.jar
 	mh_installjar -plibtomcat6-java -l --usj-name=tomcat-juli debian/poms/juli.pom $(BLDBIN)/tomcat-juli.jar
 	for i in $(T_JARS); do \
 		mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \