[DRE-commits] [gitlab] 02/06: make nginx optional, add httpd

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab.

commit 68078685d637ebab8fc87a1f4114a4ebf7dc9e2c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Apr 8 00:24:27 2016 +0530

    make nginx optional, add httpd
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index f0ab925..3424f91 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  postgresql,
  redis-server (>= 2:2.8~),
  nodejs (>= 4~),
- nginx,
+ nginx | httpd,
  postfix | exim4 | mail-transport-agent,
  openssh-client,
  gitlab-shell (>= 2.6.10~),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git