X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=2c79b1699a8eb6acc70737a1c0329b16bd14f41a;hp=bace09fb09822905bc93a43c88280f9d006bbd9c;hb=1b51e12ab3f497aafba2e09e7fe2a4a4f194c18a;hpb=51de2021aba7fb12c9e6ef214cf8ffed8e71d0f2

diff --git a/debian/control b/debian/control
index bace09f..2c79b16 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,126 @@
 Source: debian.org
-Section: admin
+Section: local/admin
 Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@debian.org>
-Uploaders: Ryan Murray <rmurray@debian.org>
-Standards-Version: 3.7.2
+Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.1
 
 Package: debian.org
 Architecture: all
-Depends: userdir-ldap, ssh (>= 10:3), zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, clamav-freshclam, clamav-daemon, sudo, emacs21-nox | emacs21, vim, vile, munin-node, gnupg
-Recommends: mcelog, bind9, famke
+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.
+
+Package: debian.org-recommended
+Architecture: all
+Depends: debian.org,
+	molly-guard
+	,
+	subversion, rcs, git-core, bzr
+	,
+	mtr-tiny, tcpdump, iproute,
+	bind9-host, dnsutils
+	,
+	emacs22-nox | emacs22 | emacs21-nox | emacs21
+	,
+	at, uptimed, irqbalance,
+	puppet,
+	locate, dlocate
+	,
+	dsa-nagios-checks
+	,
+	lshw,
+	dmidecode | not+amd64,
+	dmidecode | not+i386,
+	dmidecode | not+ia64
+	,
+	mcelog | not+amd64,
+	mcelog | not+i386
+	,
+	htop, lsof, psmisc
+	,
+	mc,
+	less
+	rsync,
+	screen,
+	ldap-utils, ldapvi,
+	mmv,
+	moreutils,
+	patchutils,
+	netcat-openbsd, socat, telnet
+	,
+	deborphan
+	,
+	bsd-mailx
+	,
+	timeout
+	,
+	strace
+	,
+	wget, curl
+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
+	gettext,
+	kcc,
+	libnet-ldap-perl,
+	libtimedate-perl,
+	libwww-perl,
+	libxml-rss-perl,
+	python2.4-minimal,
+	texlive-fonts-recommended,
+	texlive-latex-base,
+	wml
+Description: metapackages for www-master.debian.org dependencies
+ This package depends on everything that is needed for a www-master.debian.org.
+