Add molly-guard to recommended packages list

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 21458077091b002b846e09b7b4b2906430e735d6..77678d232278f2fd33742ff36d546294974e5b01 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,45 @@ Source: debian.org
 Section: local/admin
 Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@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>, Martin Zobel-Helas <zobel@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
 
 Package: debian.org
 Architecture: all

-Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, emacs22-nox | emacs22 | emacs21-nox | emacs21, vim, munin-node, gnupg, bzip2, less, cacert-spi | ca-certificates (>> 20080411), 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, dsa-nagios-nrpe-config, debian.org-recommended

 Conflicts: dchroot-dsa (<= 2:1)
 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.
  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
+       ,
+       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.