emacs22

diff --git a/debian/changelog b/debian/changelog
index 351caf37f1bada0336b576d3c98bbf18bb504ec4..1c66f7012b8197a4c35a6e405125a093321496d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian.org (12) stable; urgency=low
+
+  * emacs22 and emacs22-nox are perfectly fine emacsen.
+
+ -- Peter Palfrader <weasel@debian.org>  Tue, 10 Mar 2009 23:25:10 +0100
+

 debian.org (11) stable; urgency=low
 
   * Fix comment in apache2-vhost-update.
 debian.org (11) stable; urgency=low
 
   * Fix comment in apache2-vhost-update.

diff --git a/debian/control b/debian/control
index 552091fd3299f08ca49ceb74e04cfd4686112e46..a66ada7bd8862f86763dcdd0ce90aa2ac5856fa1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: debian.org
 Architecture: all
 
 Package: debian.org
 Architecture: all

-Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, emacs21-nox | emacs21, vim, munin-node, gnupg, bzip2, less, cacert-spi | ca-certificates (>> 20080411), ed
+Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, emacs21-nox | emacs21 | emacs22 | emacs22-nox, vim, munin-node, gnupg, bzip2, less, cacert-spi | ca-certificates (>> 20080411), ed

 Recommends: mcelog, dsa-nagios-nrpe-config
 Conflicts: dchroot-dsa (<= 2:1)
 Description: debian.org host meta-package
 Recommends: mcelog, dsa-nagios-nrpe-config
 Conflicts: dchroot-dsa (<= 2:1)
 Description: debian.org host meta-package