[DRE-commits] [SCM] ruby-passenger.git branch, master, updated. debian/3.0.12debian-1-1-ga494605

[Laurent Bigonville]

The following commit has been merged in the master branch:
commit a49460531dea28843f5939b3121490001bd561af
Author: Laurent Bigonville <bigon at debian.org>
Date:   Thu May 24 00:37:12 2012 +0200

    debian/control: Add apache2-mpm-event to the dependency alternative, it is now supported by passenger (Closes: #600679)

diff --git a/debian/changelog b/debian/changelog
index ec0e62e..523e2da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-passenger (3.0.12debian-2) UNRELEASED; urgency=low
+
+  * debian/control: Add apache2-mpm-event to the dependency alternative, it is
+    now supported by passenger (Closes: #600679)
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 24 May 2012 00:34:00 +0200
+
 ruby-passenger (3.0.12debian-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index bc13805..45365c2 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,8 @@ Package: libapache2-mod-passenger
 Architecture: any
 Section: web
 Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-mpm-worker (>= 2.2.9-9) |
- apache2-mpm-prefork (>= 2.2.9-9) | apache2-mpm-itk (>= 2.2.9-9), ruby-passenger (= ${binary:Version})
+ apache2-mpm-prefork (>= 2.2.9-9) | apache2-mpm-itk (>= 2.2.9-9) | apache2-mpm-event (>= 2.2.9-9),
+ ruby-passenger (= ${binary:Version})
 Description: Rails and Rack support for Apache2
  Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
  deployment of Ruby web applications, such as those built on the

-- 
ruby-passenger.git