X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=ad41b062900300bc19b7439d6f7fcc52dd18b59b;hp=2aa8efb356a48542059cbdd57d903571159dc755;hb=9d67f3039cb1f8d20370de866afa73270c4a8b4e;hpb=d3330b38f2cf78e6aded8db44e76b86a359a64ac

diff --git a/debian/control b/debian/control
index 2aa8efb..ad41b06 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@debian.org>
 Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>
 Build-Depends: debhelper (>= 7)
-Standards-Version: 3.7.2
+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
-Recommends: mcelog, dsa-nagios-nrpe-config, debian.org-recommended
+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
+Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
-Description: debian.org host meta-package
+Description: DSA's host metapackage
  This package depends on packages that should be installed on every
  debian.org host, and conflicts with packages that should never be
  installed.
@@ -19,18 +19,28 @@ Description: debian.org host meta-package
 Package: debian.org-recommended
 Architecture: all
 Depends: debian.org,
-	subversion, rcs, git-core
+	molly-guard
 	,
-	mtr-tiny, tcpdump, iproute,
+	subversion, rcs, git-core, bzr
+	,
+	mtr-tiny, tcpdump, iproute, tcptraceroute,
 	bind9-host, dnsutils
 	,
 	emacs22-nox | emacs22 | emacs21-nox | emacs21
 	,
-	at, uptimed,
+	at, uptimed, irqbalance,
 	puppet,
 	locate, dlocate
 	,
-	lshw, dmidecode
+	dsa-nagios-checks
+	,
+	lshw,
+	dmidecode | not+amd64,
+	dmidecode | not+i386,
+	dmidecode | not+ia64
+	,
+	mcelog | not+amd64,
+	mcelog | not+i386
 	,
 	htop, lsof, psmisc
 	,
@@ -38,7 +48,145 @@ Depends: debian.org,
 	less
 	rsync,
 	screen,
-	ldap-utils, ldapvi
-Description: meta package to pull in recommended, but not essential tools
+	ldap-utils, ldapvi,
+	mmv,
+	moreutils,
+	patchutils,
+	netcat-openbsd, socat, telnet
+	,
+	deborphan
+	,
+	bsd-mailx
+	,
+	timeout
+	,
+	strace
+	,
+	wget, curl
+	,
+	uuid-runtime
+	,
+	finger
+Description: metapackage to pull in recommended, but not essential tools
  This package depends on packages that are recommended to  be installed on
  every debian.org host but are not essential.
+
+Package: debian.org-bugs.debian.org
+Architecture: all
+Depends: graphviz,
+	libcgi-simple-perl,
+	libio-stringy-perl,
+	liblist-moreutils-perl,
+	libmime-tools-perl,
+	libmldbm-perl,
+	libparams-validate-perl,
+	libsafe-hole-perl,
+	libtext-template-perl,
+	liburi-perl,
+	libhtml-tree-perl,
+	libsoap-lite-perl
+Description: metapackages for bugs.debian.org dependencies
+ This package depends on everything that is needed for a bugs.debian.org
+ mirror or (in the future) bugs-master.
+
+
+Package: debian.org-packages.debian.org
+Architecture: all
+Depends: db4.6-util,
+	liblocale-maketext-lexicon-perl,
+	libi18n-acceptlanguage-perl,
+	libnumber-format-perl,
+	libcompress-zlib-perl,
+	libhtml-parser-perl,
+	libmldbm-perl,
+	libtext-iconv-perl,
+	libclass-accessor-perl,
+	liburi-perl,
+	libtemplate-perl,
+	liblingua-stem-perl,
+	libsearch-xapian-perl,
+	libapache2-mod-perl2,
+	libapache2-reload-perl
+Description: metapackages for packages.debian.org dependencies
+ This package depends on everything that is needed for a packages.debian.org
+ mirror or (in the future) packages-master.
+
+Package: debian.org-www-master.debian.org
+Architecture: all
+Depends: debiandoc-sgml,
+	dpkg-dev,
+	docbook-xsl,
+	gettext,
+	ghostscript,
+	kcc,
+	latex-cjk-chinese,
+	libnet-ldap-perl,
+	libtimedate-perl,
+	libwww-perl,
+	libxml-rss-perl,
+	littex,
+	po4a,
+	poxml,
+	python-xml,
+	python2.4,
+	texlive-fonts-recommended,
+	texlive-lang-cyrillic, texlive-lang-cyrillic, latex-cjk-japanese
+	texlive-latex-base,
+	texlive-latex-extra,
+	texlive-latex-recommended,
+	time,
+	w3m,
+	wml,
+	xplanet,
+	xplanet-images,
+	xsltproc,
+	procmail,
+	ldap-utils,
+	asciidoc,
+	libxml2-utils
+Description: metapackages for www-master.debian.org dependencies
+ This package depends on everything that is needed for a www-master.debian.org.
+
+
+Package: debian.org-buildd.debian.org
+Architecture: all
+Depends: edos-debcheck,
+	db4.7-util,
+        ghostscript,
+	libcompress-bzip2-perl,
+	libcompress-zlib-perl,
+	libmailtools-perl,
+	libmldbm-perl,
+	python-apt,
+	python-contract,
+	python-coverage,
+	python-coverage-test-runner
+	python-debian,
+	python-psycopg2,
+	quinn-diff,
+	r-base-core
+Description: metapackages for buildd.debian.org dependencies
+ This package depends on everything that is needed for a buildd.debian.org.
+
+
+Package: debian.org-patch-tracker.debian.org
+Architecture: all
+Depends: patchutils,
+	python,
+	python-cheetah,
+	python-pygments,
+	python-debian,
+	reprepro,
+	python-wsgiref,
+	python-simplejson,
+	python-pysqlite2,
+	diffstat
+Description: metapackages for patch-tracker.debian.org dependencies
+ This package depends on everything that is needed for a patch-tracker.debian.org.
+
+Package: debian.org-patch-planet.debian.org
+Architecture: all
+Depends: libwww-perl
+Description: metapackages for planet.debian.org dependencies
+ This package depends on everything that is needed for a planet.debian.org.
+ Note: This package is very incomplete.