[DRE-maint] Bug#545872: Does not work with apache-prefork

[Fladischer Michael]

Package: libapache2-mod-passenger
Version: 2.2.5debian-2
Severity: normal

The last patch only contained one half of the changes that I made to get
this package working. This is the full patch for the debian/control
file.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.31-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_AT.UTF-8, LC_CTYPE=de_AT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages libapache2-mod-passenger depends on:
ii  apache2-mpm-prefork         2.2.14-1     Apache HTTP Server - traditional n
ii  libapr1                     1.3.8-1      The Apache Portable Runtime Librar
ii  libaprutil1                 1.3.9+dfsg-3 The Apache Portable Runtime Utilit
ii  libc6                       2.10.1-5     GNU C Library: Shared libraries
ii  libgcc1                     1:4.4.2-2    GCC support library
ii  librack-ruby                1.0.1-1      A modular Ruby webserver interface
ii  libruby1.8                  1.8.7.174-2  Libraries necessary to run Ruby 1.
ii  libstdc++6                  4.4.2-2      The GNU Standard C++ Library v3
ii  ruby                        4.2          An interpreter of object-oriented 
ii  rubygems                    1.3.5-2      package management framework for R

libapache2-mod-passenger recommends no packages.

Versions of packages libapache2-mod-passenger suggests:
pn  passenger-doc                 <none>     (no description available)
ii  python                        2.5.4-2    An interactive high-level object-o
ii  rails                         2.2.3-1    MVC ruby based framework geared fo

-- no debconf information
-------------- next part --------------
--- debian/control.orig	2009-11-06 21:07:32.908988925 +0100
+++ debian/control	2009-11-06 21:00:25.204989491 +0100
@@ -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 | 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,7 @@
 
 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 | apache2-mpm-prefork, 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