r2403 - trunk/tomcat5/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2006-09-12 14:23:05 +0000 (Tue, 12 Sep 2006)
New Revision: 2403

Modified:
   trunk/tomcat5/debian/changelog
   trunk/tomcat5/debian/control
Log:
tomcat5 (5.0.30-11) UNRELEASED; urgency=low

  * Arnaud Vandyck <avdyk at debian.org>:

    + debian/control: removed apache-utils version and added alternative
    apache2-utils (that provide the virtual apache-utils package) (closes:
    #361277)

 --

Modified: trunk/tomcat5/debian/changelog
===================================================================
--- trunk/tomcat5/debian/changelog	2006-09-12 13:15:38 UTC (rev 2402)
+++ trunk/tomcat5/debian/changelog	2006-09-12 14:23:05 UTC (rev 2403)
@@ -1,3 +1,13 @@
+tomcat5 (5.0.30-11) UNRELEASED; urgency=low
+
+  * Arnaud Vandyck <avdyk at debian.org>:
+
+    + debian/control: removed apache-utils version and added alternative
+    apache2-utils (that provide the virtual apache-utils package) (closes:
+    #361277)
+
+ --
+
 tomcat5 (5.0.30-10) unstable; urgency=low
 
   * debian/patches/30_memory-leak_368864.patch: New patch to fix

Modified: trunk/tomcat5/debian/control
===================================================================
--- trunk/tomcat5/debian/control	2006-09-12 13:15:38 UTC (rev 2402)
+++ trunk/tomcat5/debian/control	2006-09-12 14:23:05 UTC (rev 2403)
@@ -9,7 +9,7 @@
 
 Package: tomcat5
 Architecture: all
-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
+Depends: kaffe (>= 2:1.1.6-3) | java-gcj-compat-dev (>= 1.0.41-1) | java2-runtime, libtomcat5-java (>= ${Source-Version}), adduser (>= 3.34), apache2-utils | apache-utils | 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