Update of /cvsroot/pkg-java/tomcat4/debian
In directory haydn:/tmp/cvs-serv27390/debian
Modified Files:
README.Debian ant.properties changelog control
libtomcat4-java.links rules tomcat4.init tomcat4.postinst
Log Message:
tomcat4 (4.1.31-4) unstable; urgency=low
* libant1.6 to ant transition
+ Changed libtomcat4-java.links, rules and control accordingly
+ Added ant-optional as build-dependency
+ Moved ant from Suggests to Depends
* Fixed typo in README.Debian (closes: #320437)
* Extended JDK list (closes: #301761)
* Fixed some lintian warnings
* Standards-Version 3.6.2 (no changes)
* Adde myself as uploader
-- Wolfgang Baer <WBaer at gmx.de> Sun, 18 Sep 2005 22:06:20 +0200
--- /cvsroot/pkg-java/tomcat4/debian/README.Debian 2005/03/18 02:44:25 1.10
+++ /cvsroot/pkg-java/tomcat4/debian/README.Debian 2005/09/24 23:05:12 1.11
@@ -39,7 +39,7 @@
examples. This requires installation of the tomcat4-webapps package.
- Multiple Tomcat instances can be started by different users when
- $CALALINA_BASE is set to a local directory that contains the subdirectories
+ $CATALINA_BASE is set to a local directory that contains the subdirectories
conf, logs, webapps, work and temp. See RUNNING.txt for more about this.
- Tomcat is started using a security manager, you can define the permissions
--- /cvsroot/pkg-java/tomcat4/debian/ant.properties 2005/01/06 13:25:32 1.4
+++ /cvsroot/pkg-java/tomcat4/debian/ant.properties 2005/09/24 23:05:12 1.5
@@ -16,4 +16,4 @@
struts.jar=/usr/share/struts1.1/struts.jar
xercesImpl.jar=/usr/share/java/xercesImpl.jar
xmlParserAPIs.jar=/usr/share/java/xmlParserAPIs.jar
-jsse.jar=/usr/share/java/jsse.jar
+jsse.jar=/usr/share/java/jsse.jar:/usr/share/java/jessie.jar
--- /cvsroot/pkg-java/tomcat4/debian/changelog 2005/04/12 14:10:18 1.27
+++ /cvsroot/pkg-java/tomcat4/debian/changelog 2005/09/24 23:05:12 1.28
@@ -1,3 +1,17 @@
+tomcat4 (4.1.31-4) unstable; urgency=low
+
+ * libant1.6 to ant transition
+ + Changed libtomcat4-java.links, rules and control accordingly
+ + Added ant-optional as build-dependency
+ + Moved ant from Suggests to Depends
+ * Fixed typo in README.Debian (closes: #320437)
+ * Extended JDK list (closes: #301761)
+ * Fixed some lintian warnings
+ * Standards-Version 3.6.2 (no changes)
+ * Adde myself as uploader
+
+ -- Wolfgang Baer <WBaer at gmx.de> Sun, 18 Sep 2005 22:06:20 +0200
+
tomcat4 (4.1.31-3) unstable; urgency=low
* Changed default JSP compiler for kaffe in the tomcat4 init script
--- /cvsroot/pkg-java/tomcat4/debian/control 2005/04/11 05:31:21 1.24
+++ /cvsroot/pkg-java/tomcat4/debian/control 2005/09/24 23:05:12 1.25
@@ -2,16 +2,16 @@
Section: contrib/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>, Barry Hawkins <barry at bytemason.org>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.1.0), j2sdk1.4, libant1.6-java, libservlet2.3-java, libcommons-digester-java (>= 1.5.0.1), libcommons-collections-java (>= 2.1.1), libcommons-beanutils-java (>= 1.6.1), libcommons-logging-java (>= 1.0.4), libregexp-java (>= 1.3), libcommons-fileupload-java (>= 1.0-1), libcommons-modeler-java (>= 1.1-1), libcommons-dbcp-java (>= 1.2.1-2), libmx4j-java, libstruts1.1-java, libgnujaf-java, libgnumail-java
-Standards-Version: 3.6.1
+Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Barry Hawkins <barry at bytemason.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.1.0), j2sdk1.4, ant, ant-optional, libservlet2.3-java, libcommons-digester-java (>= 1.5.0.1), libcommons-collections-java (>= 2.1.1), libcommons-beanutils-java (>= 1.6.1), libcommons-logging-java (>= 1.0.4), libregexp-java (>= 1.3), libcommons-fileupload-java (>= 1.0-1), libcommons-modeler-java (>= 1.1-1), libcommons-dbcp-java (>= 1.2.1-2), libmx4j-java, libstruts1.1-java, libgnujaf-java, libgnumail-java, libjessie-java
+Standards-Version: 3.6.2
Package: tomcat4
Architecture: all
Section: contrib/web
Priority: optional
-Depends: j2sdk1.4 | j2sdk1.3 | kaffe (>= 1.1.3) | java-virtual-machine, j2sdk1.4 | j2sdk1.3 | kaffe | java-compiler, libtomcat4-java (>= ${Source-Version}), libcommons-digester-java (>= 1.5.0.1), libcommons-collections-java (>= 2.1.1), libcommons-beanutils-java (>= 1.6.1), libcommons-logging-java (>= 1.0.4), adduser (>= 3.34), apache-utils (>= 1.3.29.0.2-1) | apache2-common, ${misc:Depends}
-Suggests: libapache-mod-jk, tomcat4-webapps, tomcat4-admin, ant
+Depends: j2sdk1.4 | j2sdk1.3 | kaffe (>= 1.1.3) | java-virtual-machine, j2sdk1.4 | j2sdk1.3 | kaffe | java-compiler, libtomcat4-java (>= ${Source-Version}), libcommons-digester-java (>= 1.5.0.1), libcommons-collections-java (>= 2.1.1), libcommons-beanutils-java (>= 1.6.1), libcommons-logging-java (>= 1.0.4), adduser (>= 3.34), apache-utils (>= 1.3.29.0.2-1) | apache2-common, ant, libjessie-java
+Suggests: libapache-mod-jk, tomcat4-webapps, tomcat4-admin
Description: Java Servlet 2.3 engine with JSP 1.2 support
Apache Tomcat 4.1 is the reference implementation for the Java Servlet 2.3
and JavaServer Pages (JSP) 1.2 specification from the Apache Jakarta project.
@@ -34,7 +34,7 @@
Architecture: all
Section: contrib/web
Priority: optional
-Depends: libxerces2-java, libservlet2.3-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
+Depends: libxerces2-java, libservlet2.3-java, ant, 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
Suggests: tomcat4
Conflicts: tomcat4 (<< 4.1.9-1)
Description: Java Servlet engine -- core libraries
--- /cvsroot/pkg-java/tomcat4/debian/libtomcat4-java.links 2004/03/10 10:50:56 1.5
+++ /cvsroot/pkg-java/tomcat4/debian/libtomcat4-java.links 2005/09/24 23:05:12 1.6
@@ -1,4 +1,4 @@
-/usr/share/ant1.6/lib/ant.jar /usr/share/tomcat4/common/lib/ant.jar
+/usr/share/ant/lib/ant.jar /usr/share/tomcat4/common/lib/ant.jar
/usr/share/java/commons-collections.jar /usr/share/tomcat4/common/lib/commons-collections.jar
/usr/share/java/commons-logging-api.jar /usr/share/tomcat4/common/lib/commons-logging-api.jar
/usr/share/java/servlet-2.3.jar /usr/share/tomcat4/common/lib/servlet.jar
--- /cvsroot/pkg-java/tomcat4/debian/rules 2005/04/11 05:39:51 1.11
+++ /cvsroot/pkg-java/tomcat4/debian/rules 2005/09/24 23:05:12 1.12
@@ -15,8 +15,8 @@
# The first two must be specified. This package needs JDK 1.4 to build because
# of the included JSSE (Java Secure Socket Extension) classes and some parts
# of ant-optional.
-JAVA_HOME := /usr/lib/j2sdk1.4-sun
-ANT_HOME := /usr/share/ant1.6
+JAVA_HOME_DIRS := /usr/local/IBMJava2-ppc-142 /usr/lib/j2sdk1.4-sun
+ANT_HOME := /usr/share/ant
# Set the JITC_PROCESSOR_TYPE environment variable to enable JIT
# appropriately in IBM JDKs on PowerPC architecture
@@ -26,7 +26,7 @@
# 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
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar ${JAVA_HOME}/jre/lib/security.jar
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar ${JAVA_HOME}/jre/lib/security.jar jessie.jar jsse.jar gnu-crypto.jar
# Build compiler
DEB_ANT_COMPILER := modern
--- /cvsroot/pkg-java/tomcat4/debian/tomcat4.init 2005/04/12 14:10:18 1.14
+++ /cvsroot/pkg-java/tomcat4/debian/tomcat4.init 2005/09/24 23:05:12 1.15
@@ -24,7 +24,7 @@
# 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-ibm /usr/lib/j2sdk1.3-ibm /usr/lib/j2sdk1.4 /usr/lib/j2sdk1.3 /usr/lib/j2se/1.4 /usr/lib/j2se/1.3 /usr/lib/kaffe"
+JDK_DIRS="/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.3-ibm /usr/lib/j2sdk1.3-blackdown /usr/lib/j2sdk1.4 /usr/lib/j2sdk1.3 /usr/lib/j2se/1.4 /usr/lib/j2se/1.3 /usr/lib/kaffe"
# Directory for per-instance configuration files and webapps
CATALINA_BASE=/var/lib/tomcat4
--- /cvsroot/pkg-java/tomcat4/debian/tomcat4.postinst 2005/01/06 13:25:32 1.4
+++ /cvsroot/pkg-java/tomcat4/debian/tomcat4.postinst 2005/09/24 23:05:12 1.5
@@ -7,7 +7,7 @@
--ingroup nogroup --disabled-password --shell /bin/false \
tomcat4
fi
- chown tomcat4.adm /var/log/tomcat4 /var/cache/tomcat4 \
+ chown tomcat4:adm /var/log/tomcat4 /var/cache/tomcat4 \
/var/lib/tomcat4/conf
chmod 750 /var/log/tomcat4 /var/lib/tomcat4/conf
chmod 700 /var/cache/tomcat4