debian.org-recommended updates for squeeze

diff --git a/debian/changelog b/debian/changelog
index cb62eb2bf4102d9a99b1528fc32b6ac227fec5c8..4ea27f7e4b2f652892c42aa0a6564a8f4869fcfb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,11 @@ debian.org (3X) UNRELEASED; urgency=low
 
   [ Peter Palfrader ]
   * A new debian.org-backports.debian.org package.
+  * debian.org-recommended updates for squeeze:
+    - Dependency on timeout can also be satisfied by coreutils >= 8.0-1.
+    - Dependency on emacs* can also be satisfied by emacs23.
 
- -- Peter Palfrader <weasel@debian.org>  Thu, 09 Sep 2010 11:15:34 +0200
+ -- Peter Palfrader <weasel@debian.org>  Thu, 09 Sep 2010 17:08:42 +0200
 
 debian.org (38) stable; urgency=low
 

diff --git a/debian/control b/debian/control
index 701ff2a7a2e6037d3a583b54cf806f205725e27d..e3025168ab04cf1f8be06186f986cb7b84344433 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Depends: debian.org,
        mtr-tiny, tcpdump, iproute, traceroute, tcptraceroute, ndisc6,
        bind9-host, dnsutils, whois
        ,
-       emacs22-nox | emacs22 | emacs21-nox | emacs21
+       emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
        ,
        at, uptimed,
        puppet,
@@ -78,7 +78,7 @@ Depends: debian.org,
        ,
        bsd-mailx
        ,
-       timeout
+       timeout | coreutils (>= 8.0-1)
        ,
        strace
        ,