X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=blobdiff_plain;f=debian%2Fcontrol;h=7458d975ae1f0a1f050b0c3714c7d0df26a425fb;hp=dbcbe1ca1fead8c4fc0ff9832e19a59beab06687;hb=a76b90a286c554f9ffff8e2cce12f3359cec4906;hpb=145dd4de0fe185f45565854ac3bba980454d6fb5

diff --git a/debian/control b/debian/control
index dbcbe1c..7458d97 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,48 @@ Source: debian.org
 Section: local/admin
 Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@debian.org>
-Uploaders: Ryan Murray <rmurray@debian.org>, Peter Palfrader <weasel@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, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, emacs21-nox | emacs21, vim, munin-node, gnupg, bzip2, less, cacert-spi, ed
-Recommends: mcelog, dsa-nagios-nrpe-config
+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, 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
+	,
+	mtr-tiny, tcpdump, iproute,
+	bind9-host, dnsutils
+	,
+	emacs22-nox | emacs22 | emacs21-nox | emacs21
+	,
+	at, uptimed,
+	puppet,
+	locate, dlocate
+	,
+	lshw,
+	dmidecode | not+amd64,
+	dmidecode | not+i386,
+	dmidecode | not+ia64,
+	,
+	htop, lsof, psmisc
+	,
+	mc,
+	less
+	rsync,
+	screen,
+	ldap-utils, ldapvi
+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.