CVS tomcat5/debian
Wolfgang B??r
wbaer-guest@haydn.debian.org
Wed Jun 29 21:44:06 2005
Update of /cvsroot/pkg-java/tomcat5/debian
In directory haydn:/tmp/cvs-serv20392/debian
Modified Files:
ant.properties changelog control libtomcat5-java.install
libtomcat5-java.links rules tomcat5-webapps.links tomcat5.init
Log Message:
towards a 5.0.30-2 release
--- /cvsroot/pkg-java/tomcat5/debian/ant.properties 2005/06/03 20:43:28 1.3
+++ /cvsroot/pkg-java/tomcat5/debian/ant.properties 2005/06/29 21:43:35 1.4
@@ -6,7 +6,7 @@
commons-dbcp.jar=/usr/share/java/commons-dbcp.jar
commons-fileupload.jar=/usr/share/java/commons-fileupload.jar
commons-logging.jar=/usr/share/java/commons-logging.jar
-commons-logging-api.jar=/usr/share/java/commons-logging.jar
+commons-logging-api.jar=/usr/share/java/commons-logging-api.jar
commons-modeler.jar=/usr/share/java/commons-modeler.jar
commons-pool.jar=/usr/share/java/commons-pool.jar
commons-el.jar=/usr/share/java/commons-el.jar
--- /cvsroot/pkg-java/tomcat5/debian/changelog 2005/06/29 18:10:40 1.2
+++ /cvsroot/pkg-java/tomcat5/debian/changelog 2005/06/29 21:43:35 1.3
@@ -1,3 +1,19 @@
+tomcat5 (5.0.30-2) experimental; urgency=low
+
+ * Added libapache2-mod-jk to suggests, missing libcommons-el-java
+ to libtomcat5-java build-depends (closes: #315038)
+ * Fixed/Added links in libtomcat5-java (jsp-api/commons-el jars added)
+ * Changed JDK dirs (as generated by java-package), enabled security
+ manager and therefore put kaffe as last jdk (currently has problems)
+ * Fixed typo in ant.properties to correctly include logging-api.jar
+ and fixed libtomcat5-java accordingly
+ * Fixed servlet-api link in tomcat5-webapps.links and included needed
+ jsp-api link
+ * Standards-Version 3.6.2 - no changes required
+ * Build-Deps to Build-Dep-Indep to fix linitan warning
+
+ -- Wolfgang Baer <WBaer@gmx.de> Wed, 29 Jun 2005 22:32:49 +0200
+
tomcat5 (5.0.30-1) experimental; urgency=low
* Initial release release based on tomcat4 package by Stefan Gybas.
--- /cvsroot/pkg-java/tomcat5/debian/control 2005/06/29 18:10:40 1.4
+++ /cvsroot/pkg-java/tomcat5/debian/control 2005/06/29 21:43:35 1.5
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>
-Build-Depends: 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
-Standards-Version: 3.6.1
+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
+Standards-Version: 3.6.2
Package: tomcat5
Architecture: all
Depends: j2sdk1.4 | j2sdk1.3 | kaffe (>= 1.1.3) | java-virtual-machine, j2sdk1.4 | j2sdk1.3 | kaffe | java-compiler, libtomcat5-java (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.29.0.2-1) | apache2-common, ${misc:Depends}
-Suggests: libapache-mod-jk, tomcat5-webapps, tomcat5-admin, ant
+Suggests: libapache-mod-jk | libapache2-mod-jk, tomcat5-webapps, tomcat5-admin, ant
Description: Java Servlet 2.4 engine with JSP 2.0 support
Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
and JavaServer Pages (JSP) 2.0 specification from the Apache Jakarta project.
@@ -31,8 +31,8 @@
Package: libtomcat5-java
Architecture: all
-Depends: libxerces2-java, libservlet2.4-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
-Suggests: tomcat5
+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
+Suggests: tomcat5
Description: Java Servlet engine -- core libraries
Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
and JavaServer Pages (JSP) 2.0 specification from the Apache Jakarta project.
--- /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.install 2005/06/29 18:10:40 1.2
+++ /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.install 2005/06/29 21:43:35 1.3
@@ -1,6 +1,6 @@
jakarta-tomcat-5/build/bin/bootstrap.jar /usr/share/tomcat5/bin/
jakarta-tomcat-5/build/bin/commons-daemon.jar /usr/share/tomcat5/bin/
-jakarta-tomcat-5/build/bin/commons-logging.jar /usr/share/tomcat5/bin/
+jakarta-tomcat-5/build/bin/commons-logging-api.jar /usr/share/tomcat5/bin/
jakarta-tomcat-5/build/bin/jmx.jar /usr/share/tomcat5/bin/
jakarta-tomcat-5/build/common/classes /usr/share/tomcat5/common/
jakarta-tomcat-5/build/common/endorsed /usr/share/tomcat5/common/
--- /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.links 2005/06/29 18:10:40 1.2
+++ /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.links 2005/06/29 21:43:35 1.3
@@ -1,7 +1,9 @@
/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/servlet-2.3.jar /usr/share/tomcat5/common/lib/servlet.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
--- /cvsroot/pkg-java/tomcat5/debian/rules 2005/06/29 18:10:40 1.4
+++ /cvsroot/pkg-java/tomcat5/debian/rules 2005/06/29 21:43:35 1.5
@@ -58,3 +58,4 @@
-rm -r jakarta-tomcat-5/compat
-rm -r jakarta-tomcat-5/deployer
-rm -r jakarta-tomcat-catalina/webapps/build/
+ -rm -f LICENSE
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5-webapps.links 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5-webapps.links 2005/06/29 21:43:35 1.2
@@ -1 +1,2 @@
-/usr/share/doc/libservlet2.4-java/api /var/lib/tomcat5/webapps/tomcat-docs/servletapi
+/usr/share/doc/libservlet2.4-java/api-servlet /var/lib/tomcat5/webapps/tomcat-docs/servletapi
+/usr/share/doc/libservlet2.4-java/api-jsp /var/lib/tomcat5/webapps/tomcat-docs/jspapi
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5.init 2005/06/29 18:10:40 1.2
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5.init 2005/06/29 21:43:35 1.3
@@ -20,15 +20,13 @@
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/kaffe /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4 /usr/lib/j2se/1.3 /usr/lib/j2sdk1.3"
+JDK_DIRS="/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-bd /usr/lib/j2sdk1.4 /usr/lib/j2sdk1.3 /usr/lib/kaffe"
# Directory for per-instance configuration files and webapps
CATALINA_BASE=/var/lib/tomcat5
# Use the Java security manager? (yes/no)
-#TOMCAT5_SECURITY=yes
-#Not sure it works with kaffe at the moment
-TOMCAT5_SECURITY=no
+TOMCAT5_SECURITY=yes
# Timeout in seconds for the shutdown of all webapps
TOMCAT5_SHUTDOWN=30