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

Signed-off-by: Peter Palfrader <peter@palfrader.org>

diff --git a/debian/changelog b/debian/changelog
index 6391d9921e91457fa826ea258138ebadd1f91d47..d738d7cdaf63c26c5ae45260408805b0ab3feef5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,11 @@ debian.org (55) UNRELEASED; urgency=low
   * debian.org-wiki.debian.org:
     + Add versioned dependency on python-moinmoin as we're in backports
 
+  [ Aurelien Jarno ]
+  * debian.org-recommended:
+    + Add emacs24-nox | emacs24 as alternative emacs dependencies, as
+      it is the default version for Jessie.
+
  -- Peter Palfrader <weasel@debian.org>  Sat, 05 Jul 2014 15:22:45 +0200
 
 debian.org (54) unstable; urgency=medium

diff --git a/debian/control b/debian/control
index 4ead5d6bb9eac686ccda7f61f9ef6a56a6192b4d..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,