lshw isn't available on *bsd either

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 06765b21893e9259c9ee823509b8bd48b7be80db..7f17e84575c79cda4d8ceded7bf00a579714fd04 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,28 +16,32 @@ Description: DSA's host metapackage
  debian.org host, and conflicts with packages that should never be
  installed.
 
+Package: debian.org-recommended-linux
+Architecture: all
+Depends: vlan, ifenslave, bridge-utils, iproute,
+       strace
+Description: metapackage to pull in recommended, but not essential tools for linux system
+ This package depends on packages that are recommended to  be installed on
+ every Linux debian.org host but are not essential.
+
 Package: debian.org-recommended
 Architecture: all
 Depends: debian.org,
+       debian.org-recommended-linux | not+gnu-linux,
        molly-guard
        ,
-       acpid (>= 2.0) | not+amd64,
-       acpid (>= 2.0) | not+i386,
-       acpid (>= 2.0) | not+ia64,
-       ,
        man-db
        ,
-       vlan, ifenslave, bridge-utils
-       ,
        subversion, rcs, git-core, bzr,
                git-svn,
                subversion-tools,
                mercurial,
        ,
-       mtr-tiny, tcpdump, iproute, traceroute, tcptraceroute, ndisc6,
+       mtr-tiny, tcpdump, tcptraceroute, ndisc6,
+       traceroute | not+gnu-linux,
        bind9-host, dnsutils, whois
        ,
-       emacs22-nox | emacs22 | emacs21-nox | emacs21
+       emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
        ,
        at, uptimed,
        puppet,
@@ -49,15 +53,16 @@ Depends: debian.org,
        ,
        dsa-nagios-checks
        ,
-       lshw,
+       lshw | not+gnu-linux,
        dmidecode | not+amd64,
        dmidecode | not+i386,
        dmidecode | not+ia64
        ,
-       mcelog | not+amd64,
-       mcelog | not+i386
+       mcelog | not+amd64 | not+gnu-linux,
+       mcelog | not+i386 | not+gnu-linux
        ,
-       htop, lsof, psmisc
+       htop, psmisc,
+       lsof | not+gnu-linux,
        ,
        mc,
                genisoimage,
@@ -78,9 +83,7 @@ Depends: debian.org,
        ,
        bsd-mailx
        ,
-       timeout
-       ,
-       strace
+       timeout | coreutils (>= 8.0-1)
        ,
        wget, curl, lftp, ftp,
        ,
@@ -94,7 +97,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,13 +247,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
+       php5,
+       moreutils (>= 0.39~)
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -338,6 +341,7 @@ Depends: mutt,
        subversion,
        python2.5,
        devscripts,
+       wdiff,
        python-pygresql,
        python-libxslt1,
        python-apt,
@@ -385,8 +389,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.