debian.org-recommended-linux

diff --git a/debian/changelog b/debian/changelog
index 1c82b03704d3bb95d7f90cc1c5b44fcf9ca9f6f8..b5ed9378a01d949c177efe66462b5f8376e05c4b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 debian.org (41) stable; urgency=low
 
   * debian.org-buildd.debian.org: Fix the moreutils versioned dependency.
+  * Split -recommended-linux off of -recommended, so we can install
+    the latter on kfreebsd hosts.  Also keep a few tools in -recommended
+    that do not yet exist on freebsd but might eventually (have not+gnu-linux
+    as an alternative for them for now).
 
- -- Peter Palfrader <weasel@debian.org>  Fri, 10 Sep 2010 20:18:24 +0200
+ -- Peter Palfrader <weasel@debian.org>  Fri, 10 Sep 2010 20:22:55 +0200
 
 debian.org (40) stable; urgency=low
 

diff --git a/debian/control b/debian/control
index 27446d691304ac04e8912668587ff9d15c7b56b4..e6adc8fc43486affad70f81353fc3dde677573d0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,21 +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
        ,
        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
@@ -50,10 +58,11 @@ Depends: debian.org,
        dmidecode | not+i386,
        dmidecode | not+ia64
        ,
-       mcelog | not+amd64,
-       mcelog | not+i386
+       mcelog | not+amd64 | not+gnu-linux,
+       mcelog | not+i38 | not+gnu-linux6
        ,
-       htop, lsof, psmisc
+       htop, psmisc,
+       lsof | not+gnu-linux,
        ,
        mc,
                genisoimage,
@@ -76,8 +85,6 @@ Depends: debian.org,
        ,
        timeout | coreutils (>= 8.0-1)
        ,
-       strace
-       ,
        wget, curl, lftp, ftp,
        ,
        dput