CVS tomcat5/debian
Wolfgang B??r
wbaer-guest at haydn.debian.org
Mon Oct 24 19:43:06 UTC 2005
Update of /cvsroot/pkg-java/tomcat5/debian
In directory haydn:/tmp/cvs-serv20911/debian
Modified Files:
NEWS changelog control rules tomcat5.default tomcat5.init
Added Files:
svg_example.patch
Log Message:
tomcat5 (5.0.30-7) unstable; urgency=low
* Move to main - upload with orig.tar.gz included
* Works with kaffe (>= 2:1.1.6-3) and java-gcj-compat-dev (>= 1.0.41-1)
* Removed libcommons-httpclient-java build-dep - not needed
* Fixed URL in JSP example (closes: #327790)
* Updated tomcat5.default
--- /cvsroot/pkg-java/tomcat5/debian/NEWS 2005/09/11 11:00:42 1.1
+++ /cvsroot/pkg-java/tomcat5/debian/NEWS 2005/10/24 19:43:05 1.2
@@ -8,4 +8,4 @@
the old conf/Standalone/localhost directory you have to move them into the
new directory. Afterwards you may delete the old Standalone directory.
- -- Wolfgang Baer <WBaer at gmx.de> Wed, 07 Sep 2005 17:25:44 +0200
\ No newline at end of file
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 07 Sep 2005 17:25:44 +0200
--- /cvsroot/pkg-java/tomcat5/debian/changelog 2005/09/11 11:00:43 1.6
+++ /cvsroot/pkg-java/tomcat5/debian/changelog 2005/10/24 19:43:05 1.7
@@ -1,3 +1,15 @@
+tomcat5 (5.0.30-7) unstable; urgency=low
+
+ * Move to main - upload with orig.tar.gz included
+ * Works with kaffe (>= 2:1.1.6-3) and java-gcj-compat-dev (>= 1.0.41-1)
+ + changed debian/control accordingly
+ + adjusted tomcat5.init file
+ * Removed libcommons-httpclient-java build-dep - not needed
+ * Fixed URL in JSP example (closes: #327790)
+ * Updated tomcat5.default
+
+ -- Wolfgang Baer <WBaer at gmx.de> Thu, 06 Oct 2005 21:59:36 +0200
+
tomcat5 (5.0.30-6) unstable; urgency=low
* Move commons-fileupload jar from common/lib to server/lib
--- /cvsroot/pkg-java/tomcat5/debian/control 2005/09/11 11:00:43 1.7
+++ /cvsroot/pkg-java/tomcat5/debian/control 2005/10/24 19:43:05 1.8
@@ -1,15 +1,15 @@
Source: tomcat5
-Section: contrib/web
+Section: web
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>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.30), 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, liblog4j1.2-java, libxerces2-java, libxalan2-java, junit, libcommons-httpclient-java, libsaxpath-java, libjaxen-java, libcommons-el-java, libjessie-java, libcommons-launcher-java, unzip, xsltproc
+Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.30), 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, liblog4j1.2-java, libxerces2-java, libxalan2-java, junit, libsaxpath-java, libjaxen-java, libcommons-el-java, libjessie-java, libcommons-launcher-java, unzip, xsltproc
Standards-Version: 3.6.2
Package: tomcat5
Architecture: all
-Depends: j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe (>= 2:1.1.5-cvs20050808-2), libtomcat5-java (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.29.0.2-1) | apache2-common
-Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5-webapps, tomcat5-admin, ant
+Depends: kaffe (>= 2:1.1.6-3) | java-gcj-compat-dev (>= 1.0.41-1) | java2-runtime, libtomcat5-java (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.33-1) | apache2-common
+Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5-webapps, tomcat5-admin
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.
--- /cvsroot/pkg-java/tomcat5/debian/rules 2005/09/11 11:00:43 1.7
+++ /cvsroot/pkg-java/tomcat5/debian/rules 2005/10/24 19:43:05 1.8
@@ -52,3 +52,5 @@
-d $(TOMCAT_BUILD)/webapps/servlets-examples/
rm $(TOMCAT_BUILD)/webapps/jsp-examples/examples-jsp.war
rm $(TOMCAT_BUILD)/webapps/servlets-examples/examples-servlet.war
+ # patch for port number, not in debian/patches as the file is only available now
+ patch -p0 < debian/svg_example.patch
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5.default 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5.default 2005/10/24 19:43:05 1.2
@@ -3,13 +3,15 @@
#TOMCAT5_USER=tomcat5
# The home directory of the Java development kit (JDK). You need at least
-# JDK version 1.2, just the Java runtime environment (JRE) will not work
+# JDK version 1.3, just the Java runtime environment (JRE) will not work
# because a Java compiler is needed to translate JavaServer Pages (JSP).
-# If JAVA_HOME is not set, some common directories for the j2sdk1.4 and
-# j2sdk1.3 Debian packages from Blackdown are tried. You can also set
-# JSSE_HOME here to enable SSL support (this is automatically done for
-# JDK 1.4+).
-#JAVA_HOME=/usr/local/j2sdk1.4.0
+# If JAVA_HOME is not set, some common directories for the non-free JDKs
+# as packaged by the Debian java-package and the directories of
+# java-gcj-compat-dev and kaffe are tried.
+#
+# You can also set JSSE_HOME here to enable SSL support
+# (this is automatically done for JDK 1.4+, java-gcj-compat-dev and kaffe).
+#JAVA_HOME=/usr/lib/jvm/java-gcj
#JSSE_HOME=/usr/local/jsse
# Directory for per-instance configuration files and webapps. It contain the
@@ -35,4 +37,3 @@
# Number of days to keep old log files in /var/log/tomcat5 (default: 14)
#LOGFILE_DAYS=30
-
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5.init 2005/09/11 11:00:43 1.5
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5.init 2005/10/24 19:43:05 1.6
@@ -20,17 +20,13 @@
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-JDK_DIRS="ß /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/kaffe"
+JDK_DIRS="/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /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
-# Still broken for kaffe at the moment
-if [ "$JAVA_HOME" = "/usr/lib/kaffe" ]; then
- TOMCAT5_SECURITY=no
-fi
# Timeout in seconds for the shutdown of all webapps
TOMCAT5_SHUTDOWN=30
@@ -66,7 +62,7 @@
# Set java.awt.headless=true if CATALINA_OPTS is not set so the
# Xalan XSL transformer can work without X11 display on JDK 1.4+
# It also looks like the default heap size of 64M is not enough for most cases
-# se the maximum heap size is set to 128M
+# so the maximum heap size is set to 128M
if [ -z "$CATALINA_OPTS" ]; then
CATALINA_OPTS="-Djava.awt.headless=true -Xmx128M"
fi
More information about the pkg-java-commits
mailing list