X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fcontrol;h=50590424f14a796f3c21b6972e7cc1d6872a2554;hb=b5190ff7d318e21bd204189243b5545b640b65a3;hp=b72f9218fc07b3a44aa0e1acdb03df930db95dd6;hpb=026982a349a3ab02806a9787d82f6a5688a51c00;p=dsa-metapackages.git

diff --git a/debian/control b/debian/control
index b72f921..5059042 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.1
 
 Package: debian.org
 Architecture: all
-Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1), nagios-plugins-standard (>= 1.4.15) | nagios-plugins-basic
+Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, nano, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1), nagios-plugins-standard (>= 1.4.15) | nagios-plugins-basic
 Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
 Description: DSA's host metapackage
@@ -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,
@@ -506,7 +504,8 @@ Depends: db4.8-util,
 		libapache2-mod-fcgid,
 	python-apt, python-psycopg2,
 	libdbd-pg-ruby,
-	rrdtool
+	rrdtool,
+	raptor-utils | raptor2-utils
 Description: metapackage for qa.debian.org
  This package depends on all the packages that are needed for qa.debian.org setup.
 
@@ -583,9 +582,11 @@ Depends:   binutils,
 	diffstat,
 	dpkg-dev,
 	debhelper,
+	devscripts,
 	fakeroot,
 	file,
 	gettext,
+	gnuplot-nox | gnuplot,
 	intltool-debian,
 	libapt-pkg-perl,
 	libarchive-zip-perl,
@@ -604,6 +605,7 @@ Depends:   binutils,
 	locales,
 	man-db,
 	perl,
+	t1utils,
 	unzip,
 	xz-utils
 	,
@@ -767,3 +769,13 @@ Depends: asciidoc,
 Description: metapackage for piuparts.debian.org
  This package depends on all the packages that are needed for the
  piuparts.debian.org setup.
+
+Package: debian.org-wiki.debian.org
+Architecture: all
+Depends: libapache2-mod-wsgi,
+	libjson-perl,
+	python-moinmoin,
+	python-launchpadlib,
+	libsoap-lite-perl
+Description: metapackage for wiki.debian.org
+ This package depends on all the packages that are needed for the Debian wiki