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

diff --git a/debian/control b/debian/control
index 2aa8efb..322f4b6 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
+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,7 +19,9 @@ Description: debian.org host meta-package
 Package: debian.org-recommended
 Architecture: all
 Depends: debian.org,
-	subversion, rcs, git-core
+	molly-guard
+	,
+	subversion, rcs, git-core, bzr
 	,
 	mtr-tiny, tcpdump, iproute,
 	bind9-host, dnsutils
@@ -30,7 +32,15 @@ Depends: debian.org,
 	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,58 @@ 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,
+	psutils
+	,
+	deborphan, dialog
+	,
+	bsd-mailx
+	,
+	timeout
+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.
+