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

[Tony Mancill]

Author: tmancill
Date: 2011-03-23 05:26:56 +0000 (Wed, 23 Mar 2011)
New Revision: 13450

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/control
   trunk/tomcat6/debian/rules
Log:
add tomcat6-extras package and modify rules to build catalina-jmx-remote; Debian #614333

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2011-03-21 22:31:19 UTC (rev 13449)
+++ trunk/tomcat6/debian/changelog	2011-03-23 05:26:56 UTC (rev 13450)
@@ -7,13 +7,15 @@
     Thanks to Dave Walker.  (Closes: #617553)
   * Move tomcat6-instance-create manpage from section 2 to section 8.
     Thanks to brian m. carlson (Closes: #607682)
+  * Add tomcat6-extras package. 
+    Currently includes only catalina-jmx-remote.jar  (Closes: #614333)
 
   [ Thierry Carrez ]
   * debian/tomcat6-instance-create: Eclipse can now be configured to use a
     user instance of tomcat6 using tomcat6-instance-create without any
     additional work. Patch from Abhinav Upadhyay (Closes: #551091, LP: #297675)
 
- -- Thierry Carrez <thierry.carrez at ubuntu.com>  Wed, 16 Mar 2011 14:28:01 +0100
+ -- tony mancill <tmancill at debian.org>  Tue, 22 Mar 2011 22:25:30 -0700
 
 tomcat6 (6.0.32-1) unstable; urgency=low
 

Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control	2011-03-21 22:31:19 UTC (rev 13449)
+++ trunk/tomcat6/debian/control	2011-03-23 05:26:56 UTC (rev 13450)
@@ -129,3 +129,13 @@
  .
  This package contains the online documentation web application.
 
+Package: tomcat6-extras
+Architecture: all
+Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
+Description: Servlet and JSP engine -- additional components
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains additional ("extra") component libraries.
+ (Currently only catalina-jmx-remote.jar.)

Modified: trunk/tomcat6/debian/rules
===================================================================
--- trunk/tomcat6/debian/rules	2011-03-21 22:31:19 UTC (rev 13449)
+++ trunk/tomcat6/debian/rules	2011-03-23 05:26:56 UTC (rev 13450)
@@ -20,6 +20,7 @@
 T_VER := $(shell dpkg-parsechangelog | egrep '^Version:' \
 	| cut -f 2 -d ' ' | cut -f 2 -d ' '|sed 's/-[^-]*$$//')
 T_JARS := tomcat-i18n-fr tomcat-i18n-es tomcat-i18n-ja catalina-ant
+T_EXTRAS_JARS := catalina-jmx-remote
 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)
@@ -49,6 +50,7 @@
 build-stamp:
 	dh_testdir
 	$(ANT_INVOKE) deploy-webapps
+	$(ANT_INVOKE) -buildfile extras.xml jmx-remote
 	javadoc -subpackages "javax.servlet" -d "output/api" \
 		-sourcepath "java" -author -version -breakiterator \
 		-windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \
@@ -101,6 +103,14 @@
 			usr/share/java/$$i.jar && \
 		dh_link -ptomcat6-common usr/share/java/$$i-$(T_VER).jar \
 			usr/share/tomcat6/lib/$$i.jar; done
+	for i in $(T_EXTRAS_JARS); do \
+		mv output/extras/$$i.jar output/extras/$$i-$(T_VER).jar && \
+		dh_install -plibtomcat6-java \
+			output/extras/$$i-$(T_VER).jar usr/share/java && \
+		dh_link -plibtomcat6-java usr/share/java/$$i-$(T_VER).jar \
+			usr/share/java/$$i.jar && \
+		dh_link -ptomcat6-extras usr/share/java/$$i-$(T_VER).jar \
+			usr/share/tomcat6/lib/$$i.jar; done
 	dh_install --exclude=.bat --exclude=Thumbs.db
 	dh_link
 	mh_installpoms -plibservlet2.5-java