fix some dependencies on linux-only stuff

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 2e271ad5ad8b01541c250e636ef8d433e6ed0cb1..50590424f14a796f3c21b6972e7cc1d6872a2554 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,16 +21,21 @@ Architecture: all
 Depends: vlan, ifenslave, bridge-utils, iproute,
        strace,
        lsscsi,
-       ethtool
+       ethtool,
+       bwm-ng,
+       iputils-tracepath,
+       traceroute,
+       lshw,
+       lsof
 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
+Architecture: any
 Depends: debian.org,
        busybox-static,
-       debian.org-recommended-linux | not+gnu-linux,
+       debian.org-recommended-linux [linux-any],
        molly-guard
        ,
        man-db
@@ -41,9 +46,7 @@ Depends: debian.org,
                mercurial,
                cvs
        ,
-       mtr-tiny, tcpdump, tcptraceroute, ndisc6, bwm-ng,
-       traceroute | not+gnu-linux,
-       iputils-tracepath | not+gnu-linux,
+       mtr-tiny, tcpdump, tcptraceroute, ndisc6,
        bind9-host, dnsutils, whois, unbound-host
        ,
        emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
@@ -58,18 +61,13 @@ Depends: debian.org,
        ,
        dsa-nagios-checks
        ,
-       lshw | not+gnu-linux,
-       dmidecode | not+amd64,
-       dmidecode | not+i386,
-       dmidecode | not+ia64
+       dmidecode [amd64 i386 ia64]
        ,
        ipython
        ,
-       mcelog | not+amd64 | not+gnu-linux,
-       mcelog | not+i386 | not+gnu-linux,
+       mcelog [amd64 i386]
        ,
        htop, psmisc,
-       lsof | not+gnu-linux
        ,
        ncdu,
        mc,