r2224 - in trunk/tomcat5/debian: . patches
Michael Koch
mkoch at costa.debian.org
Sat Jul 1 14:33:36 UTC 2006
Author: mkoch
Date: 2006-07-01 14:33:35 +0000 (Sat, 01 Jul 2006)
New Revision: 2224
Added:
trunk/tomcat5/debian/patches/30_memory-leak_368864.patch
Modified:
trunk/tomcat5/debian/
trunk/tomcat5/debian/changelog
trunk/tomcat5/debian/control
trunk/tomcat5/debian/patches/
trunk/tomcat5/debian/rules
trunk/tomcat5/debian/tomcat5-admin.postinst
trunk/tomcat5/debian/tomcat5-admin.prerm
trunk/tomcat5/debian/tomcat5-webapps.postinst
trunk/tomcat5/debian/tomcat5-webapps.prerm
Log:
tomcat5 (5.0.30-10) unstable; urgency=low
* debian/patches/30_memory-leak_368864.patch: New patch to fix
OutOfMemoryError issue (Closes: #368864). Thanks to Steinar H.
Gunderson for the patch.
* debian/rules: Build with java-gcj-compat (Closes: #375883).
* debian/control: Moved cdbs and debhelper to Build-Depends.
* debian/control: Build-Depends-Indep on java-gcj-compat-dev.
* debian/tomcat4-admin.postinst, debian/tomcat4-admin.prerm,
debian/tomcat4-webapps.postinst, debian/tomcat4-webapps.prerm:
Use invoke-rc.d instead of calling /etc/init.d/tomcat5 directly.
* Updated Standards-Version to 3.7.2.
* Added myself to the Uploaders field.
-- Michael Koch <konqueror at gmx.de> Sat, 1 Jul 2006 13:32:19 +0000
Property changes on: trunk/tomcat5/debian
___________________________________________________________________
Name: svn:ignore
+ files
libtomcat5-java
stamp-*
tomcat5
tomcat5-admin
tomcat5-webapps
*.debhelper
Modified: trunk/tomcat5/debian/changelog
===================================================================
--- trunk/tomcat5/debian/changelog 2006-07-01 11:47:23 UTC (rev 2223)
+++ trunk/tomcat5/debian/changelog 2006-07-01 14:33:35 UTC (rev 2224)
@@ -1,3 +1,19 @@
+tomcat5 (5.0.30-10) unstable; urgency=low
+
+ * debian/patches/30_memory-leak_368864.patch: New patch to fix
+ OutOfMemoryError issue (Closes: #368864). Thanks to Steinar H.
+ Gunderson for the patch.
+ * debian/rules: Build with java-gcj-compat (Closes: #375883).
+ * debian/control: Moved cdbs and debhelper to Build-Depends.
+ * debian/control: Build-Depends-Indep on java-gcj-compat-dev.
+ * debian/tomcat4-admin.postinst, debian/tomcat4-admin.prerm,
+ debian/tomcat4-webapps.postinst, debian/tomcat4-webapps.prerm:
+ Use invoke-rc.d instead of calling /etc/init.d/tomcat5 directly.
+ * Updated Standards-Version to 3.7.2.
+ * Added myself to the Uploaders field.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 1 Jul 2006 13:32:19 +0000
+
tomcat5 (5.0.30-9) unstable; urgency=low
* kaffe compiler transition
Modified: trunk/tomcat5/debian/control
===================================================================
--- trunk/tomcat5/debian/control 2006-07-01 11:47:23 UTC (rev 2223)
+++ trunk/tomcat5/debian/control 2006-07-01 14:33:35 UTC (rev 2224)
@@ -2,9 +2,10 @@
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, libsaxpath-java, libjaxen-java, libcommons-el-java, libjessie-java, libcommons-launcher-java, unzip, xsltproc
-Standards-Version: 3.6.2
+Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.30)
+Build-Depends-Indep: java-gcj-compat-dev, 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.7.2
Package: tomcat5
Architecture: all
Property changes on: trunk/tomcat5/debian/patches
___________________________________________________________________
Name: svn:ignore
+ *.log
Added: trunk/tomcat5/debian/patches/30_memory-leak_368864.patch
===================================================================
--- trunk/tomcat5/debian/patches/30_memory-leak_368864.patch 2006-07-01 11:47:23 UTC (rev 2223)
+++ trunk/tomcat5/debian/patches/30_memory-leak_368864.patch 2006-07-01 14:33:35 UTC (rev 2224)
@@ -0,0 +1,10 @@
+--- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java.orig 2006-07-01 13:38:10.000000000 +0000
++++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java 2006-07-01 13:38:58.000000000 +0000
+@@ -1482,6 +1482,7 @@
+ jarFiles[i] = null;
+ }
+
++ org.apache.commons.beanutils.PropertyUtils.clearDescriptors();
+ notFoundResources.clear();
+ resourceEntries.clear();
+ resources = null;
Modified: trunk/tomcat5/debian/rules
===================================================================
--- trunk/tomcat5/debian/rules 2006-07-01 11:47:23 UTC (rev 2223)
+++ trunk/tomcat5/debian/rules 2006-07-01 14:33:35 UTC (rev 2224)
@@ -12,10 +12,10 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar
+DEB_JARS := $(ANT_HOME)/lib/ant-trax.jar
DEB_ANT_BUILD_TARGET := build
Modified: trunk/tomcat5/debian/tomcat5-admin.postinst
===================================================================
--- trunk/tomcat5/debian/tomcat5-admin.postinst 2006-07-01 11:47:23 UTC (rev 2223)
+++ trunk/tomcat5/debian/tomcat5-admin.postinst 2006-07-01 14:33:35 UTC (rev 2224)
@@ -8,8 +8,8 @@
# New installation, not a package upgrade
if [ -x /etc/init.d/tomcat5 ]; then
# Only restart tomcat if it is already running
- if /etc/init.d/tomcat5 status >/dev/null; then
- /etc/init.d/tomcat5 force-reload
+ if invoke-rc.d tomcat5 status >/dev/null; then
+ invoke-rc.d tomcat5 force-reload
fi
fi
fi
Modified: trunk/tomcat5/debian/tomcat5-admin.prerm
===================================================================
--- trunk/tomcat5/debian/tomcat5-admin.prerm 2006-07-01 11:47:23 UTC (rev 2223)
+++ trunk/tomcat5/debian/tomcat5-admin.prerm 2006-07-01 14:33:35 UTC (rev 2224)
@@ -11,8 +11,8 @@
# Remove the webapp if this is not an upgrade
if [ -x /etc/init.d/tomcat5 ]; then
# Only restart tomcat if it is already running
- if /etc/init.d/tomcat5 status >/dev/null; then
- /etc/init.d/tomcat5 force-reload || true
+ if invoke-rc.d tomcat5 status >/dev/null; then
+ invoke-rc.d tomcat5 force-reload || true
fi
fi
;;
Modified: trunk/tomcat5/debian/tomcat5-webapps.postinst
===================================================================
--- trunk/tomcat5/debian/tomcat5-webapps.postinst 2006-07-01 11:47:23 UTC (rev 2223)
+++ trunk/tomcat5/debian/tomcat5-webapps.postinst 2006-07-01 14:33:35 UTC (rev 2224)
@@ -8,8 +8,8 @@
# New installation, not a package upgrade
if [ -x /etc/init.d/tomcat5 ]; then
# Only restart tomcat if it is already running
- if /etc/init.d/tomcat5 status >/dev/null; then
- /etc/init.d/tomcat5 force-reload
+ if invoke-rc.d tomcat5 status >/dev/null; then
+ invoke-rc.d tomcat5 force-reload
fi
fi
fi
Modified: trunk/tomcat5/debian/tomcat5-webapps.prerm
===================================================================
--- trunk/tomcat5/debian/tomcat5-webapps.prerm 2006-07-01 11:47:23 UTC (rev 2223)
+++ trunk/tomcat5/debian/tomcat5-webapps.prerm 2006-07-01 14:33:35 UTC (rev 2224)
@@ -11,8 +11,8 @@
# Remove the webapp if this is not an upgrade
if [ -x /etc/init.d/tomcat5 ]; then
# Only restart tomcat if it is already running
- if /etc/init.d/tomcat5 status >/dev/null; then
- /etc/init.d/tomcat5 force-reload || true
+ if invoke-rc.d tomcat5 status >/dev/null; then
+ invoke-rc.d tomcat5 force-reload || true
fi
fi
;;
More information about the pkg-java-commits
mailing list