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

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 986ce80a7578ca80f17661c5d7814acc230f5e5e..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
        ,
@@ -94,7 +90,6 @@ Depends: debian.org,
        ,
        w3m,
        elinks,
-       ,
        mutt
 Description: metapackage to pull in recommended, but not essential tools
  This package depends on packages that are recommended to  be installed on
@@ -245,14 +240,14 @@ Depends: edos-distcheck,
        python-psycopg2,
        python-mako,
        python-nose,
-       python-sqlalchemy (>= 0.5), 
+       python-sqlalchemy (>= 0.5),
        python-sqlalchemy (<< 0.6),
        quinn-diff,
        r-base-core,
        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.
 
@@ -387,8 +382,15 @@ Depends: libapache2-mod-php5, libapache2-mod-wsgi,
        python-lxml, python-psycopg2, python-soappy, python-virtualenv,
        python-sqlalchemy, python-simplejson,
        perl,
-       libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl, 
+       libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl,
        procmail,
        moreutils
-Description: metapackage for nm.debian.org 
- This package depends on all the packages that are needed for nm.debian.org setup. 
+Description: metapackage for nm.debian.org
+ This package depends on all the packages that are needed for nm.debian.org setup.
+
+Package: debian.org-backports.debian.org
+Architecture: all
+Depends: debian.org-ftpmaster.debian.org,
+       libdbi-perl, libdbd-pg-perl
+Description: metapackage for backports.debian.org
+ This package depends on all the packages that are needed for backports.debian.org setup.