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

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-08-04 15:48:43 +0000 (Tue, 04 Aug 2009)
New Revision: 9595

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/maven.rules
   trunk/tomcat6/debian/rules
Log:
* Fix jsp-api dependency in the Maven descriptors.
* Put tomcat-juli.jar in /usr/share/java instead of juli.jar.
  This fixes a broken link which prevented tomcat to start
  when logging is turned on, and restores the file layout
  defined in 6.0.20-2.
* Restore links to the jars in usr/share/tomcat6/lib

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-08-04 15:47:31 UTC (rev 9594)
+++ trunk/tomcat6/debian/changelog	2009-08-04 15:48:43 UTC (rev 9595)
@@ -1,3 +1,14 @@
+tomcat6 (6.0.20-5) experimental; urgency=low
+
+  * Fix jsp-api dependency in the Maven descriptors.
+  * Put tomcat-juli.jar in /usr/share/java instead of juli.jar.
+    This fixes a broken link which prevented tomcat to start
+    when logging is turned on, and restores the file layout
+    defined in 6.0.20-2.
+  * Restore links to the jars in usr/share/tomcat6/lib
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sat, 25 Jul 2009 11:15:00 +0100
+
 tomcat6 (6.0.20-4) experimental; urgency=low
 
   * Fix init script:

Modified: trunk/tomcat6/debian/maven.rules
===================================================================
--- trunk/tomcat6/debian/maven.rules	2009-08-04 15:47:31 UTC (rev 9594)
+++ trunk/tomcat6/debian/maven.rules	2009-08-04 15:48:43 UTC (rev 9595)
@@ -4,5 +4,5 @@
 javax.el el-api jar *
 # 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-api jar s/.*/2.1/
+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	2009-08-04 15:47:31 UTC (rev 9594)
+++ trunk/tomcat6/debian/rules	2009-08-04 15:48:43 UTC (rev 9595)
@@ -78,8 +78,8 @@
 	dh_installcron
 	mh_installpoms -plibtomcat6-java
 	for i in $(T_MAVENIZED_JARS); do \
-		mh_installjar -plibtomcat6-java -l debian/poms/$$i.pom $(BLDLIB)/$$i.jar; done
-	mh_installjar -plibtomcat6-java -l debian/poms/juli.pom $(BLDBIN)/tomcat-juli.jar
+		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=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 && \
 		dh_install -plibtomcat6-java \