debian.org-buildd.debian.org: Fix the moreutils versioned dependency

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 701ff2a7a2e6037d3a583b54cf806f205725e27d..27446d691304ac04e8912668587ff9d15c7b56b4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,10 +21,6 @@ Architecture: all
 Depends: debian.org,
        molly-guard
        ,
-       acpid (>= 2.0) | not+amd64,
-       acpid (>= 2.0) | not+i386,
-       acpid (>= 2.0) | not+ia64,
-       ,
        man-db
        ,
        vlan, ifenslave, bridge-utils
@@ -37,7 +33,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 +74,7 @@ Depends: debian.org,
        ,
        bsd-mailx
        ,
-       timeout
+       timeout | coreutils (>= 8.0-1)
        ,
        strace
        ,
@@ -251,7 +247,7 @@ Depends: edos-distcheck,
        r-cran-lattice,
        postgresql-8.4, postgresql-8.4-debversion,
        php5,
-       moreutils (>= 0.39)
+       moreutils (>= 0.39~)
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.