[debian-edu-commits] debian-edu/pkg-team/ 32/32: Bin:package gosa: Alternatively depend on libapache2-mod-php5, php5-cgi _or_ php5-fpm. (Closes: #718859).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit 0cf1666d739f03fad4c2fa6cbacdcf466839666a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Apr 1 18:48:47 2014 +0200

    Bin:package gosa: Alternatively depend on libapache2-mod-php5, php5-cgi _or_ php5-fpm. (Closes: #718859).
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8fbb7a8..76ee21e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ gosa (2.7.4+reloaded1-1) UNRELEASED; urgency=low
       ttf-liberation). (Closes: #722358).
     + Bin:package gosa: Alternatively depend on php5-mysqlnd or php-mysql.
       (Closes: #718857).
+    + Bin:package gosa: Alternatively depend on libapache2-mod-php5,
+      php5-cgi _or_ php5-fpm. (Closes: #718859).
   * debian/gosa-plugin-mail.install, debian/gosa-plugin-mail.<scripts>:
     + Install conffiles to location where they are expected by the
       GOsa² WebGUI. Handle conffile moval in bin:package gracefully.
diff --git a/debian/control b/debian/control
index daf6114..d41bbb6 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Depends:
  smarty3 (>= 3.1.10-1),
  gettext,
  ${misc:Depends},
- libapache2-mod-php5 | php5-cgi,
+ libapache2-mod-php5 | php5-cgi | php5-fpm,
  php5-curl,
  fonts-liberation,
 Recommends:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git