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

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-06-18 18:41:04 +0000 (Thu, 18 Jun 2009)
New Revision: 8518

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/rules
   trunk/tomcat6/debian/tomcat6-common.install
   trunk/tomcat6/debian/tomcat6-common.links
Log:
Expose tomcat-juli.jar as a library in /usr/share/java
as it is a dependency of jasper which is used also by jetty

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-06-17 23:13:59 UTC (rev 8517)
+++ trunk/tomcat6/debian/changelog	2009-06-18 18:41:04 UTC (rev 8518)
@@ -1,3 +1,10 @@
+tomcat6 (6.0.20-2) unstable; urgency=low
+
+  * Expose tomcat-juli.jar as a library in /usr/share/java
+    as it is a dependency of jasper which is used also by jetty
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 15 Jun 2009 13:33:13 +0100
+
 tomcat6 (6.0.20-1) unstable; urgency=low
 
   * new upstream release (Closes: #531873)

Modified: trunk/tomcat6/debian/rules
===================================================================
--- trunk/tomcat6/debian/rules	2009-06-17 23:13:59 UTC (rev 8517)
+++ trunk/tomcat6/debian/rules	2009-06-18 18:41:04 UTC (rev 8518)
@@ -5,6 +5,7 @@
 JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 JAVA_CMD := $(JAVA_HOME)/bin/java
 BLDLIB := output/build/lib
+BLDBIN := output/build/bin
 DEB_JARS_BASE := /usr/share/java
 DEB_JARS := ant ant-launcher ant-trax
 DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
@@ -84,6 +85,9 @@
 			usr/share/java/$$i.jar && \
 		dh_link -ptomcat6-common usr/share/java/$$i-$(T_VER).jar \
 			usr/share/tomcat6/lib/$$i.jar; done
+	dh_install -plibtomcat6-java $(BLDBIN)/tomcat-juli.jar usr/share/java
+	dh_link -plibtomcat6-java usr/share/java/tomcat-juli.jar \
+			usr/share/java/tomcat-juli-$(T_VER).jar
 	dh_install --exclude=.bat --exclude=Thumbs.db
 	dh_link
 	chmod a+x debian/tomcat6-common/usr/share/tomcat6/bin/*.sh

Modified: trunk/tomcat6/debian/tomcat6-common.install
===================================================================
--- trunk/tomcat6/debian/tomcat6-common.install	2009-06-17 23:13:59 UTC (rev 8517)
+++ trunk/tomcat6/debian/tomcat6-common.install	2009-06-18 18:41:04 UTC (rev 8518)
@@ -1,2 +1,2 @@
-output/build/bin/* /usr/share/tomcat6/bin/
+output/build/bin/bootstrap.jar /usr/share/tomcat6/bin/
 bin/* /usr/share/tomcat6/bin/

Modified: trunk/tomcat6/debian/tomcat6-common.links
===================================================================
--- trunk/tomcat6/debian/tomcat6-common.links	2009-06-17 23:13:59 UTC (rev 8517)
+++ trunk/tomcat6/debian/tomcat6-common.links	2009-06-18 18:41:04 UTC (rev 8518)
@@ -1,3 +1,4 @@
+/usr/share/java/tomcat-juli.jar /usr/share/tomcat6/bin/tomcat-juli.jar
 /usr/share/java/commons-dbcp.jar /usr/share/tomcat6/lib/commons-dbcp.jar
 /usr/share/java/commons-pool.jar /usr/share/tomcat6/lib/commons-pool.jar
 /usr/share/java/el-api-2.1.jar /usr/share/tomcat6/lib/el-api.jar