-
Committer:
Bazaar Package Importer
-
Author(s):
Thierry Carrez
-
Date:
2008-11-18 13:52:48 UTC
-
mfrom:
(2.1.1 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081118135248-dyzrsxrpudipmg48
Tags: 5.5.26-5ubuntu1
* Merge from debian unstable (LP: #298043), remaining changes:
- debian/control: add libecj-java builddep to fix FTBFS with default-jdk
- debian/rules: Set java source and target version to 1.5
- debian/rules: Don't fail install if Tomcat cannot be started
- debian/tomcat5.5.init: Fix JVM list to match java2-runtime-headless
providers, and do not refuse using JREs
- debian/tomcat5.5.install: Don't install catalina.policy
* debian/changelog: Removed duplicate entries
* debian/tomcat5.5.init: Added LSB exit codes to status action (LP: #298051)
* debian/rules: dropped Ubuntu-specific TearDown implementation which might
break LifecycleListener