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

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 36172aa91d1992b8072eeb093746038f00bc47f7..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
        ,
@@ -93,7 +89,8 @@ Depends: debian.org,
        unzip
        ,
        w3m,
-       elinks
+       elinks,
+       mutt
 Description: metapackage to pull in recommended, but not essential tools
  This package depends on packages that are recommended to  be installed on
  every debian.org host but are not essential.
@@ -241,13 +238,16 @@ Depends: edos-distcheck,
        python-coverage-test-runner,
        python-debian,
        python-psycopg2,
+       python-mako,
        python-nose,
-       python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6)
+       python-sqlalchemy (>= 0.5),
+       python-sqlalchemy (<< 0.6),
        quinn-diff,
        r-base-core,
        r-cran-lattice,
        postgresql-8.4, postgresql-8.4-debversion,
-       php5
+       php5,
+       moreutils (>= 0.39~)
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -302,7 +302,7 @@ Depends: apt-utils,
        python-pygresql,
        python-pyrss2gen,
        python-yaml,
-       python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6)
+       python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
        binutils-multiarch,
        build-essential,
        devscripts,
@@ -323,10 +323,28 @@ Depends: apt-utils,
        lynx,
        libxml-rss-perl,
        ghostscript,
-       perforate
+       perforate,
+       wdiff
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
 
+Package: debian.org-release.debian.org
+Architecture: all
+Depends: mutt,
+       subversion,
+       python2.5,
+       devscripts,
+       wdiff,
+       python-pygresql,
+       python-libxslt1,
+       python-apt,
+       python-debian,
+       libapt-pkg-perl,
+       procmail
+Description: metapackage for release
+ This package depends on everything that is needed for a release.debian.org
+ setup.
+
 Package: debian.org-cdbuilder.debian.org
 Architecture: all
 Depends: bittornado,
@@ -348,3 +366,31 @@ Depends: locales-all,
        gs-common
 Description: metapackage for manpages
  This package depends on all the packages that are needed for manpages.d.o setup.
+
+Package: debian.org-nm.debian.org
+Architecture: all
+Depends: libapache2-mod-php5, libapache2-mod-wsgi,
+       php5-cli,
+       php5-ldap, php5-pgsql,
+       wml,
+       mutt, mboxgrep,
+       python,
+       python-mako (>= 0.2.5), python-gnupginterface, python-ldap,
+       python-apt, python-beautifulsoup, python-debianbts, python-dns,
+       python-dnspython, python-egenix-mxdatetime, python-egenix-mxtools,
+       python-elementtree | python (>= 2.6), python-flup, python-libxml2,
+       python-lxml, python-psycopg2, python-soappy, python-virtualenv,
+       python-sqlalchemy, python-simplejson,
+       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.
+
+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.