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

[Gabriele Giacone]

Author: gg0-guest
Date: 2010-02-21 14:57:16 +0000 (Sun, 21 Feb 2010)
New Revision: 11665

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/maven.rules
   trunk/tomcat6/debian/rules
Log:
s/org.apache.tomcat/javax.* fix

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-02-21 14:38:23 UTC (rev 11664)
+++ trunk/tomcat6/debian/changelog	2010-02-21 14:57:16 UTC (rev 11665)
@@ -1,3 +1,9 @@
+tomcat6 (6.0.24-3) unstable; urgency=low
+
+  * Fixed Maven support
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 21 Feb 2010 15:44:19 +0100
+
 tomcat6 (6.0.24-2) unstable; urgency=low
 
   * Fix missing symlinks to tomcat-coyote.jar and

Modified: trunk/tomcat6/debian/maven.rules
===================================================================
--- trunk/tomcat6/debian/maven.rules	2010-02-21 14:38:23 UTC (rev 11664)
+++ trunk/tomcat6/debian/maven.rules	2010-02-21 14:57:16 UTC (rev 11665)
@@ -2,7 +2,3 @@
 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-02-21 14:38:23 UTC (rev 11664)
+++ trunk/tomcat6/debian/rules	2010-02-21 14:57:16 UTC (rev 11665)
@@ -72,9 +72,12 @@
 	dh_installcron
 	mkdir -p debian/poms
 	cp res/maven/*.pom debian/poms
-	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\@/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\@/$(T_VER)/' debian/poms/*.pom
 	mh_installpoms -plibtomcat6-java
 	for i in $(T_MAVENIZED_JARS); do \