[pkg-java] r8495 - trunk/libjboss-remoting-java/debian

[Torsten Werner]

Author: twerner
Date: 2009-06-15 19:17:45 +0000 (Mon, 15 Jun 2009)
New Revision: 8495

Modified:
   trunk/libjboss-remoting-java/debian/changelog
   trunk/libjboss-remoting-java/debian/control
   trunk/libjboss-remoting-java/debian/rules
Log:
UNRELEASED
* Switch to tomcat 6. (Closes: #533150)

Modified: trunk/libjboss-remoting-java/debian/changelog
===================================================================
--- trunk/libjboss-remoting-java/debian/changelog	2009-06-14 12:56:51 UTC (rev 8494)
+++ trunk/libjboss-remoting-java/debian/changelog	2009-06-15 19:17:45 UTC (rev 8495)
@@ -1,11 +1,12 @@
-libjboss-remoting-java (2.5.0.SP2-1) unstable; urgency=low
+libjboss-remoting-java (2.5.1-1) unstable; urgency=low
 
-  UNRELEASED - does not build with tomcat 5.5
+  UNRELEASED
   * New upstream release
   * Refresh patch concurrent.diff.
   * Lock debian/watch to version 2.x because 3.x is still beta.
+  * Switch to tomcat 6. (Closes: #533150)
 
- -- Torsten Werner <twerner at debian.org>  Sun, 28 Dec 2008 18:43:15 +0100
+ -- Torsten Werner <twerner at debian.org>  Mon, 15 Jun 2009 21:01:28 +0200
 
 libjboss-remoting-java (2.4.0.SP1+dak1-1) unstable; urgency=low
 

Modified: trunk/libjboss-remoting-java/debian/control
===================================================================
--- trunk/libjboss-remoting-java/debian/control	2009-06-14 12:56:51 UTC (rev 8494)
+++ trunk/libjboss-remoting-java/debian/control	2009-06-15 19:17:45 UTC (rev 8495)
@@ -4,8 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, java-gcj-compat-dev, libtomcat5.5-java, libjboss-common-java,
- libjboss-serialization-java, libservlet2.4-java, libjboss-jmx-java, liblog4j1.2-java,
+Build-Depends-Indep: ant, java-gcj-compat-dev, libtomcat6-java, libjboss-common-java,
+ libjboss-serialization-java, libservlet2.5-java, libjboss-jmx-java, liblog4j1.2-java,
  libcommons-httpclient-java, libjboss-naming-java, libconcurrent-java
 Standards-Version: 3.8.0
 Homepage: http://labs.jboss.com/jbossremoting/

Modified: trunk/libjboss-remoting-java/debian/rules
===================================================================
--- trunk/libjboss-remoting-java/debian/rules	2009-06-14 12:56:51 UTC (rev 8494)
+++ trunk/libjboss-remoting-java/debian/rules	2009-06-15 19:17:45 UTC (rev 8495)
@@ -5,11 +5,10 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME 		:= /usr/lib/jvm/java-gcj
-TOMCAT_LIB_DIR		:= /usr/share/tomcat5.5/server/lib
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_JARS		:= jboss-common log4j-1.2 $(TOMCAT_LIB_DIR)/tomcat-coyote $(TOMCAT_LIB_DIR)/tomcat-util \
-			   commons-httpclient servlet-api jboss-serialization jboss-jmx jnpserver concurrent
+DEB_JARS		:= jboss-common log4j-1.2 tomcat-coyote commons-httpclient servlet-api-2.5 \
+  jboss-serialization jboss-jmx jnpserver concurrent
 
 install/libjboss-remoting-java::
 	install -m 644 -D jboss-remoting.jar $(DEB_DESTDIR)/usr/share/java/jboss-remoting-$(DEB_UPSTREAM_VERSION).jar