Merge branch 'master' of ssh://db.debian.org/git/debian.org

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 9cdcf96c2a2e91319c8a1cbbee7042f2d73d0017..7e7c6cec4bc3ba0d463ebc00b98eded654044918 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,25 +16,29 @@ 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
        ,
        emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
@@ -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,
@@ -80,8 +85,6 @@ Depends: debian.org,
        ,
        timeout | coreutils (>= 8.0-1)
        ,
-       strace
-       ,
        wget, curl, lftp, ftp,
        ,
        dput
@@ -252,7 +255,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.