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

diff --git a/debian/control b/debian/control
index 8f39c7f..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
@@ -20,16 +20,22 @@ Package: debian.org-recommended-linux
 Architecture: all
 Depends: vlan, ifenslave, bridge-utils, iproute,
 	strace,
-	lsscsi
+	lsscsi,
+	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
@@ -40,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
@@ -57,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,
@@ -129,6 +128,7 @@ Depends: graphviz,
 	liburi-perl,
 	libhtml-tree-perl,
 	libsoap-lite-perl,
+	libtext-iconv-perl,
 	libdbd-pg-perl,
 	python-pyinotify,
 	python-yaml
@@ -141,6 +141,7 @@ Architecture: all
 Depends: debian.org-bugs.debian.org,
 	gnuplot,
 	ttf-liberation,
+	kgb-client-git,
 	lynx	
 Description: metapackages for bugs-master.debian.org dependencies
  This package depends on everything that is needed for a
@@ -207,6 +208,7 @@ Depends: debiandoc-sgml,
 	docbook-dsssl,
 	docbook-xsl,
 	dpkg-dev,
+	gawk (>= 1:4.0.1),
 	gettext,
 	ghostscript,
 	imagemagick,
@@ -407,6 +409,8 @@ Depends: edos-debcheck,
 	picosat,
 	openjdk-6-jre-headless,
 	git-email,
+	python-networkx,
+	python-pygraphviz,
 Description: metapackage for release
  This package depends on everything that is needed for a release.debian.org
  setup.
@@ -425,7 +429,8 @@ Depends: bittornado,
 	fakeroot,
 	dosfstools,
 	libsoap-lite-perl,
-	devscripts
+	devscripts,
+	mtools
 Description: metapackage for cdbuilder
  This package depends on all the packages that are needed for a cdbuilder setup.
 
@@ -499,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.
 
@@ -576,11 +582,14 @@ Depends:   binutils,
 	diffstat,
 	dpkg-dev,
 	debhelper,
+	devscripts,
 	fakeroot,
 	file,
 	gettext,
+	gnuplot-nox | gnuplot,
 	intltool-debian,
 	libapt-pkg-perl,
+	libarchive-zip-perl,
 	libclass-accessor-perl,
 	libclone-perl,
 	libdigest-sha-perl,
@@ -590,11 +599,13 @@ Depends:   binutils,
 	libipc-run-perl,
 	libparse-debianchangelog-perl,
 	libtimedate-perl,
+	libtext-levenshtein-perl,
 	libtext-template-perl,
 	liburi-perl,
 	locales,
 	man-db,
 	perl,
+	t1utils,
 	unzip,
 	xz-utils
 	,
@@ -735,3 +746,36 @@ Depends: gettext,
 	rrdtool
 Description: metapackages for l10n.debian.org dependencies
  This package depends on everything that is needed for l10n.debian.org.
+
+Package: debian.org-piuparts.debian.org
+Architecture: all
+Depends: asciidoc,
+	git,
+	xmlto,
+	debootstrap,
+	debsums,
+	lsb-release,
+	lsof,
+	python-debian,
+	python-debianbts,
+	apache2,
+	ghostscript,
+	python-rpy,
+	r-base-dev,
+	r-recommended,
+	tango-icon-theme,
+	screen,
+	python-apt
+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