debian.org-recommended: Add emacs24-nox | emacs24 as alternative emacs dependencies.

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index e7befd326b276e8929cb0cf2bd8c921b8e3dcb7a..79bfb2dac2a5f8982b8e71516eb1c1532ef76634 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Depends: debian.org,
        mtr-tiny, tcpdump, tcptraceroute, ndisc6,
        bind9-host, dnsutils, whois, unbound-host
        ,
-       emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21,
+       emacs24-nox | emacs24 | emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21,
        vim-scripts, vim-addon-manager
        ,
        at, uptimed,
@@ -318,6 +318,7 @@ Depends:
        php5-cgi,
        php5-pgsql,
        libapache2-mod-fcgid,
+       libgmp10,
        libyaml-libyaml-perl
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
@@ -567,7 +568,7 @@ Depends:
 # Runtime
        libapache2-mod-wsgi,
        python-apt,
-       python-beautifulsoup,
+       python-bs4,
        python-debian,
        python-django (>= 1.6),
        python-django-jsonfield,
@@ -862,7 +863,7 @@ Package: debian.org-wiki.debian.org
 Architecture: all
 Depends: libapache2-mod-wsgi,
        libjson-perl,
-       python-moinmoin,
+       python-moinmoin (>= 1.9.7-2~bpo7+1),
        python-launchpadlib,
        libsoap-lite-perl
 Description: metapackage for wiki.debian.org