CVS tomcat5/debian

Arnaud Vandyck avdyk at haydn.debian.org
Sat Aug 20 08:42:34 UTC 2005 

Update of /cvsroot/pkg-java/tomcat5/debian
In directory haydn:/tmp/cvs-serv1280

Modified Files:
	changelog control libtomcat5-java.install 
	libtomcat5-java.links rules tomcat5-admin.install 
	tomcat5-webapps.install 
Log Message:
tomcat5 (5.0.30-4) unstable; urgency=low

  * upload to unstable
  * debian/control: ant transition: change the dep from libant1.6-java to
    ant
  * debian/libtomcat5-java.links: added some links and corrected ant once
  * updated to libcommons-collection3-java


--- /cvsroot/pkg-java/tomcat5/debian/changelog	2005/08/05 10:17:25	1.4
+++ /cvsroot/pkg-java/tomcat5/debian/changelog	2005/08/20 08:42:33	1.5
@@ -1,3 +1,20 @@
+tomcat5 (5.0.30-5) unstable; urgency=low
+
+  * debian/control (libtomcat5-java: Depends): added
+    libcommons-launcher-java
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Sat, 20 Aug 2005 10:34:05 +0200
+
+tomcat5 (5.0.30-4) unstable; urgency=low
+
+  * upload to unstable
+  * debian/control: ant transition: change the dep from libant1.6-java to
+    ant
+  * debian/libtomcat5-java.links: added some links and corrected ant once
+  * updated to libcommons-collection3-java
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Fri, 19 Aug 2005 16:06:27 +0200
+
 tomcat5 (5.0.30-3) experimental; urgency=low
 
   * Added libapache2-mod-jk to suggests, missing libcommons-el-java
--- /cvsroot/pkg-java/tomcat5/debian/control	2005/06/29 21:43:35	1.5
+++ /cvsroot/pkg-java/tomcat5/debian/control	2005/08/20 08:42:33	1.6
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.1.0), kaffe, libant1.6-java, libregexp-java, libcommons-beanutils-java, libcommons-collections-java, libcommons-fileupload-java (>= 1.0-1), libcommons-digester-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java,  libcommons-dbcp-java, libstruts1.2-java, libgnujaf-java, libgnumail-java, libcommons-daemon-java, liblog4j1.2-java, libxerces2-java, libxalan2-java, junit, libcommons-httpclient-java, libsaxpath-java, libjaxen-java, libcommons-el-java, libjessie-java, libcommons-launcher-java
+Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.1.0), kaffe, ant, libregexp-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-fileupload-java (>= 1.0-1), libcommons-digester-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java,  libcommons-dbcp-java, libstruts1.2-java, libgnujaf-java, libgnumail-java, libcommons-daemon-java, liblog4j1.2-java, libxerces2-java, libxalan2-java, junit, libcommons-httpclient-java, libsaxpath-java, libjaxen-java, libcommons-el-java, libjessie-java, libcommons-launcher-java
 Standards-Version: 3.6.2
 
 Package: tomcat5
@@ -31,7 +31,7 @@
 
 Package: libtomcat5-java
 Architecture: all
-Depends: libxerces2-java, libservlet2.4-java, libcommons-el-java, libant1.6-java, libregexp-java, libcommons-beanutils-java, libcommons-collections-java, libcommons-digester-java, libcommons-fileupload-java (>= 1.0-1), libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libcommons-dbcp-java, libcommons-daemon-java
+Depends: libxerces2-java, libservlet2.4-java, libcommons-el-java, ant, libregexp-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-digester-java, libcommons-fileupload-java (>= 1.0-1), libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libcommons-dbcp-java, libcommons-daemon-java, libcommons-launcher-java
 Suggests: tomcat5 
 Description: Java Servlet engine -- core libraries
  Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
--- /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.install	2005/08/05 10:10:52	1.4
+++ /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.install	2005/08/20 08:42:33	1.5
@@ -9,3 +9,5 @@
 jakarta-tomcat-5/build/server/lib/servlets-*.jar /usr/share/tomcat5/server/lib/
 jakarta-tomcat-5/build/server/lib/servlets-*.renametojar /usr/share/tomcat5/server/lib/
 jakarta-tomcat-5/build/server/lib/tomcat-*.jar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/server/lib/jkconfig.jar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/server/lib/jkshm.jar /usr/share/tomcat5/server/lib/
--- /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.links	2005/08/05 10:11:09	1.4
+++ /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.links	2005/08/20 08:42:33	1.5
@@ -1,23 +1,22 @@
-/usr/share/ant1.6/lib/ant.jar		/usr/share/tomcat5/common/lib/ant.jar
-/usr/share/java/commons-collections.jar	/usr/share/tomcat5/common/lib/commons-collections.jar
-/usr/share/java/commons-logging-api.jar	/usr/share/tomcat5/common/lib/commons-logging-api.jar
+/usr/share/java/commons-logging-api.jar		/usr/share/tomcat5/bin/commons-logging-api.jar
+/usr/share/java/commons-daemon.jar 		/usr/share/tomcat5/bin/commons-daemon.jar
+/usr/share/java/commons-launcher.jar		/usr/share/tomcat5/bin/commons-launcher.jar
 
-/usr/share/java/commons-logging-api.jar	/usr/share/tomcat5/bin/commons-logging-api.jar
-/usr/share/java/commons-daemon.jar /usr/share/tomcat5/bin/commons-daemon.jar
+/usr/share/ant/lib/ant.jar			/usr/share/tomcat5/common/lib/ant.jar
+/usr/share/ant/lib/ant-launcher.jar		/usr/share/tomcat5/common/lib/ant-launcher.jar
+/usr/share/java/commons-collections3.jar	/usr/share/tomcat5/common/lib/commons-collections3.jar
+/usr/share/java/commons-dbcp.jar		/usr/share/tomcat5/common/lib/commons-dbcp.jar
+/usr/share/java/commons-el.jar 			/usr/share/tomcat5/common/lib/commons-el.jar
+/usr/share/java/commons-fileupload.jar		/usr/share/tomcat5/common/lib/commons-fileupload.jar
+/usr/share/java/commons-pool.jar		/usr/share/tomcat5/common/lib/commons-pool.jar
+/usr/share/java/jsp-api.jar	 		/usr/share/tomcat5/common/lib/jsp-api.jar
+/usr/share/java/servlet-api.jar			/usr/share/tomcat5/common/lib/servlet-api.jar
 
-/usr/share/java/servlet-api.jar		/usr/share/tomcat5/common/lib/servlet-api.jar
-/usr/share/java/jsp-api.jar /usr/share/tomcat5/common/lib/jsp-api.jar
-/usr/share/java/commons-el.jar /usr/share/tomcat5/common/lib/commons-el.jar
-/usr/share/java/xercesImpl.jar		/usr/share/tomcat5/common/lib/xercesImpl.jar
-/usr/share/java/xmlParserAPIs.jar	/usr/share/tomcat5/common/lib/xmlParserAPIs.jar
-/usr/share/java/commons-beanutils.jar	/usr/share/tomcat5/server/lib/commons-beanutils.jar
-/usr/share/java/commons-dbcp.jar	/usr/share/tomcat5/server/lib/commons-dbcp.jar
-/usr/share/java/commons-digester.jar	/usr/share/tomcat5/server/lib/commons-digester.jar
-/usr/share/java/commons-fileupload.jar	/usr/share/tomcat5/common/lib/commons-fileupload.jar
-/usr/share/java/commons-logging.jar	/usr/share/tomcat5/server/lib/commons-logging.jar
-/usr/share/java/commons-modeler.jar	/usr/share/tomcat5/server/lib/commons-modeler.jar
-/usr/share/java/regexp.jar		/usr/share/tomcat5/server/lib/jakarta-regexp.jar
-/usr/share/java/mx4j.jar		/usr/share/tomcat5/server/lib/mx4j.jar
+/usr/share/java/commons-beanutils.jar		/usr/share/tomcat5/server/lib/commons-beanutils.jar
+/usr/share/java/commons-digester.jar		/usr/share/tomcat5/server/lib/commons-digester.jar
+/usr/share/java/commons-modeler.jar		/usr/share/tomcat5/server/lib/commons-modeler.jar
+/usr/share/java/regexp.jar			/usr/share/tomcat5/server/lib/jakarta-regexp.jar
 
-/usr/share/tomcat5/server/lib/catalina-ant.jar	/usr/share/ant/lib/catalina5-ant.jar
+/usr/share/java/mx4j.jar			/usr/share/tomcat5/server/lib/mx4j.jar
 
+/usr/share/tomcat5/server/lib/catalina-ant.jar	/usr/share/ant/lib/catalina5-ant.jar
--- /cvsroot/pkg-java/tomcat5/debian/rules	2005/06/29 21:43:35	1.5
+++ /cvsroot/pkg-java/tomcat5/debian/rules	2005/08/20 08:42:33	1.6
@@ -21,7 +21,7 @@
 # of ant-optional.
 #JAVA_HOME := /usr/lib/j2se/1.4
 JAVA_HOME := /usr/lib/kaffe
-ANT_HOME  := /usr/share/ant1.6
+ANT_HOME  := /usr/share/ant
 
 # Additional JARs to add to the class path, either full path or just the
 # basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5-admin.install	2005/06/29 18:10:40	1.2
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5-admin.install	2005/08/20 08:42:33	1.3
@@ -3,4 +3,3 @@
 debian/policy/10admin.policy			  /etc/tomcat5/policy.d/
 jakarta-tomcat-5/build/server/webapps/admin /usr/share/tomcat5/server/webapps/
 jakarta-tomcat-5/build/server/webapps/manager /usr/share/tomcat5/server/webapps/
-
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5-webapps.install	2005/06/29 18:10:40	1.2
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5-webapps.install	2005/08/20 08:42:33	1.3
@@ -6,3 +6,5 @@
 jakarta-tomcat-5/build/webapps/webdav	 /var/lib/tomcat5/webapps/
 debian/webapps/examples.xml			 /var/lib/tomcat5/webapps/
 
+jakarta-servletapi-5/jsr152/examples/WEB-INF/lib/jstl.jar	/usr/share/tomcat5/server/webapps/jsp-examples/WEB-INF/lib
+jakarta-servletapi-5/jsr152/examples/WEB-INF/lib/standard.jar	/usr/share/tomcat5/server/webapps/jsp-examples/WEB-INF/lib

More information about the pkg-java-commits mailing list