CVS tomcat4/debian

[Stefan Gybas]

Update of /cvsroot/pkg-java/tomcat4/debian
In directory haydn:/tmp/cvs-serv20513

Modified Files:
	README.Debian changelog control tomcat4.init 
Added Files:
	tomcat4-admin.links 
Log Message:
Debian relase 4.1.30-6


--- /cvsroot/pkg-java/tomcat4/debian/README.Debian	2004/06/14 12:17:02	1.8
+++ /cvsroot/pkg-java/tomcat4/debian/README.Debian	2004/08/13 11:49:46	1.9
@@ -5,6 +5,11 @@
   /usr/share/tomcat4, the base directory (CATALINA_BASE) is /var/lib/tomcat4
   but some files in there are just symlinks to the proper FHS directories.
 
+  There's a .debian directory in /usr/share/tomcat4 which contains templates
+  for configuration files. These are copied to the conf direcory during
+  the package installation when the corresponding destination does not yet
+  exist.
+
 - The package has been built as "light" distribution which means that some
   of the additional features like JavaMail, JTA and Tyrex are not enabled.
   Catalina was compiled using MX4J so JMX is available for an embedded
@@ -38,12 +43,17 @@
 
 - Tomcat is started using a security manager, you can define the permissions
   for your servlets and JSPs in /etc/tomcat4/policy.d/*. All files in this
-  directory are joined to /etc/tomcat4/catalina.policy. Other Debian packages
-  that contain web applications might provide their own security rules in a
-  file in this directory, e.g. for JDBC access. You can also completely
-  disable the security manager in /etc/default/tomcat4 but this is not
-  recommended since a call to System.exit() in a servlet of JSP page
-  would then stop the whole virtual machine that is running Tomcat.
+  directory are joined to /etc/tomcat4/catalina.policy.
+
+  If your webapp does not work with the tomcat4 Debian package but works fine
+  with the binary distribution from Jakarta, try to disbale the security
+  manager in /etc/default/tomcat4 first. If this works, add the required
+  permissions in a new file in /etc/tomcat4/policy.d/ and re-enable the
+  security manager.
+
+  Disbaling the security manager is not recommended on production systems
+  since a call to System.exit() in a servlet of JSP page would then stop the
+  whole virtual machine that is running Tomcat.
 
 - There is a webapp for basic web-based administration of Tomcat's webapps
   in the tomcat4-admin package. You need to add one of the users in
--- /cvsroot/pkg-java/tomcat4/debian/changelog	2004/06/14 12:17:02	1.21
+++ /cvsroot/pkg-java/tomcat4/debian/changelog	2004/08/13 11:49:46	1.22
@@ -1,3 +1,16 @@
+tomcat4 (4.1.30-6) unstable; urgency=low
+
+  * Remove /var/log/tomcat4/catalina.out after stopping Tomcat so downgrades
+    should work (closes: #259155)
+  * Only depend on apache-utils | apache2-common to find rotatelogs(2)
+    (closes: #263881)
+  * Better explain in README.Debian what to do if a webapp does not work with
+    the Debian package (closes: #260785)
+  * Added a note to README.Debian about the /usr/share/tomcat4/.debian
+    directory (closes: #247855)
+
+ -- Stefan Gybas <sgybas@debian.org>  Fri, 13 Aug 2004 13:12:28 +0200
+
 tomcat4 (4.1.30-5) unstable; urgency=low
 
   * Allow apache-common (<< 1.3.29.0.2-1) as alterantive to apache-utils so
--- /cvsroot/pkg-java/tomcat4/debian/control	2004/06/14 12:17:02	1.18
+++ /cvsroot/pkg-java/tomcat4/debian/control	2004/08/13 11:49:46	1.19
@@ -10,7 +10,7 @@
 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}), adduser (>= 3.34), apache-common (<< 1.3.29.0.2-1) | apache-utils (>= 1.3.29.0.2-1) | apache2-common, ${misc:Depends}
+Depends: j2sdk1.4 | j2sdk1.3 | kaffe (>= 1.1.3) | java-virtual-machine, j2sdk1.4 | j2sdk1.3 | kaffe | java-compiler, libtomcat4-java (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.29.0.2-1) | apache2-common, ${misc:Depends}
 Suggests: libapache-mod-jk, tomcat4-webapps, tomcat4-admin, ant
 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
--- /cvsroot/pkg-java/tomcat4/debian/tomcat4.init	2004/06/14 12:17:02	1.10
+++ /cvsroot/pkg-java/tomcat4/debian/tomcat4.init	2004/08/13 11:49:46	1.11
@@ -174,7 +174,7 @@
 					--user "$TOMCAT4_USER"
 			fi
 		done
-		rm -f "$CATALINA_PID"
+		rm -f "$CATALINA_PID" "$CATALINA_BASE/logs/catalina.out"
 		echo "$NAME."
 	fi
 	;;