From ae6439978ae0ccf344ca9b5796f0ed6eab764a73 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 10 Sep 2010 20:23:54 +0200 Subject: [PATCH] debian.org-recommended-linux --- debian/changelog | 6 +++++- debian/control | 23 +++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c82b03..b5ed937 100644 --- 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 Fri, 10 Sep 2010 20:18:24 +0200 + -- Peter Palfrader Fri, 10 Sep 2010 20:22:55 +0200 debian.org (40) stable; urgency=low diff --git a/debian/control b/debian/control index 27446d6..e6adc8f 100644 --- 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 -- 2.30.2