dmidecode only exists on amd64, i386, ia64

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index d00135ad4a277e5be9158dbd73b6e5ed6516eb4e..7458d975ae1f0a1f050b0c3714c7d0df26a425fb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,15 @@ Section: local/admin
 Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@debian.org>
 Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>
 Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@debian.org>
 Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>

-Standards-Version: 3.7.2
+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, libpam-pwdfile, vim, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron
 
 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: mcelog, 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.


@@ -18,6 +19,8 @@ Description: debian.org host meta-package
 Package: debian.org-recommended
 Architecture: all
 Depends: debian.org,
 Package: debian.org-recommended
 Architecture: all
 Depends: debian.org,

+       molly-guard
+       ,

        subversion, rcs, git-core
        ,
        mtr-tiny, tcpdump, iproute,
        subversion, rcs, git-core
        ,
        mtr-tiny, tcpdump, iproute,


@@ -29,7 +32,10 @@ Depends: debian.org,
        puppet,
        locate, dlocate
        ,
        puppet,
        locate, dlocate
        ,

-       lshw, dmidecode
+       lshw,
+       dmidecode | not+amd64,
+       dmidecode | not+i386,
+       dmidecode | not+ia64,

        ,
        htop, lsof, psmisc
        ,
        ,
        htop, lsof, psmisc
        ,


@@ -38,6 +44,6 @@ Depends: debian.org,
        rsync,
        screen,
        ldap-utils, ldapvi
        rsync,
        screen,
        ldap-utils, ldapvi

-Description: meta package to pull in recommended, but not essential tools
+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.
  This package depends on packages that are recommended to  be installed on
  every debian.org host but are not essential.