[DRE-commits] r4306 - trunk/passenger/debian

[Micah Anderson]

Author: micah
Date: 2009-11-06 22:42:44 +0000 (Fri, 06 Nov 2009)
New Revision: 4306

Modified:
   trunk/passenger/debian/changelog
   trunk/passenger/debian/control
Log:
really fix the build-dep this time

Modified: trunk/passenger/debian/changelog
===================================================================
--- trunk/passenger/debian/changelog	2009-11-06 05:19:08 UTC (rev 4305)
+++ trunk/passenger/debian/changelog	2009-11-06 22:42:44 UTC (rev 4306)
@@ -1,3 +1,9 @@
+passenger (2.2.5debian-3) unstable; urgency=low
+
+  * Really fix apache2-mpm-preform dependencies (Closes: #545872)
+
+ -- Micah Anderson <micah at debian.org>  Fri, 06 Nov 2009 17:41:46 -0500
+
 passenger (2.2.5debian-2) unstable; urgency=low
 
   * Update control to allow for possible installation of 

Modified: trunk/passenger/debian/control
===================================================================
--- trunk/passenger/debian/control	2009-11-06 05:19:08 UTC (rev 4305)
+++ trunk/passenger/debian/control	2009-11-06 22:42:44 UTC (rev 4306)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Filipe Lautert <filipe at debian.org>, Micah Anderson <micah at debian.org>, David Moreno <damog at debian.org>
-Build-Depends: debhelper (>= 7), apache2-threaded-dev (>= 2.2.9-9),
- apache2-mpm-worker | apache2-mpm-prefork, libapr1-dev, rubygems (>= 1.2), debhelper (>= 5.0.44), 
- ruby-dev, doxygen, asciidoc (>= 8.2), graphviz, rake, cdbs, source-highlight
+Build-Depends: debhelper (>= 7), apache2-threaded-dev (>= 2.2.9-9) | apache2-prefork-dev (>= 2.2.9-9), 
+ libapr1-dev, rubygems (>= 1.2), debhelper (>= 5.0.44), ruby-dev, doxygen, asciidoc (>= 8.2), graphviz, 
+ rake, cdbs, source-highlight
 Standards-Version: 3.8.3
 Homepage: http://www.modrails.com/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/passenger/
@@ -13,7 +13,8 @@
 
 Package: libapache2-mod-passenger
 Architecture: any
-Depends: ${shlibs:Depends}, apache2-mpm-worker, ruby, rubygems (>= 1.2), ${misc:Depends}, librack-ruby
+Depends: ${shlibs:Depends}, apache2-mpm-worker (>= 2.2.9-9) | apache2-mpm-prefork (>= 2.2.9-9), ruby, 
+ rubygems (>= 1.2), ${misc:Depends}, librack-ruby
 Suggests: python, rails, passenger-doc
 Description: Rails and Rack support for Apache2
  Phusion Passenger — a.k.a. mod_rails or mod_rack — makes