Merge remote-tracking branch 'enrico/master'

* enrico/master:
  Away with php

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/debian/changelog b/debian/changelog
index ba2ca1a8d16d121227f9e971da623e1c2ac061eb..141167596b6d10643993a36af18d057074fa4225 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,7 @@ debian.org (52) UNRELEASED; urgency=low
     + python-django-south
     + postgresql-client
     + python-markdown
+    - libapache-mod-php5
 
   [ Simon Paillard ]
   * debian.org-packages.debian.org: switch from modperl to fastcgi

diff --git a/debian/control b/debian/control
index a930edad980efd0bbd46e076b4443c22f3cf3b43..ab84e74ead1bee93be7bcad4dccf1e2e54dda2af 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -467,7 +467,7 @@ Description: metapackage for manpages
 
 Package: debian.org-nm.debian.org
 Architecture: all
-Depends: libapache2-mod-php5, libapache2-mod-wsgi,
+Depends: libapache2-mod-wsgi,
        mutt, mboxgrep,
        python,
        python-mako (>= 0.2.5), python-gnupginterface, python-ldap,