qa: add python-gpgme

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 46f3861b5a98e4505b7a378509bfe0827805e18b..c83ca4b3b83d0d44dac4476708daf4fa59bc41ed 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,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, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1), nagios-plugins-standard (>= 1.4.15) | nagios-plugins-basic
+Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, nano, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1), nagios-plugins-standard (>= 1.4.15) | nagios-plugins-basic
 Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
 Description: DSA's host metapackage
@@ -21,16 +21,21 @@ Architecture: all
 Depends: vlan, ifenslave, bridge-utils, iproute,
        strace,
        lsscsi,
-       ethtool
+       ethtool,
+       bwm-ng,
+       iputils-tracepath,
+       traceroute,
+       lshw,
+       lsof
 Description: metapackage to pull in recommended, but not essential tools for linux system
  This package depends on packages that are recommended to  be installed on
  every Linux debian.org host but are not essential.
 
 Package: debian.org-recommended
-Architecture: all
+Architecture: any
 Depends: debian.org,
        busybox-static,
-       debian.org-recommended-linux | not+gnu-linux,
+       debian.org-recommended-linux [linux-any],
        molly-guard
        ,
        man-db
@@ -41,9 +46,7 @@ Depends: debian.org,
                mercurial,
                cvs
        ,
-       mtr-tiny, tcpdump, tcptraceroute, ndisc6, bwm-ng
-       traceroute | not+gnu-linux,
-       iputils-tracepath | not+gnu-linux,
+       mtr-tiny, tcpdump, tcptraceroute, ndisc6,
        bind9-host, dnsutils, whois, unbound-host
        ,
        emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
@@ -58,18 +61,13 @@ Depends: debian.org,
        ,
        dsa-nagios-checks
        ,
-       lshw | not+gnu-linux,
-       dmidecode | not+amd64,
-       dmidecode | not+i386,
-       dmidecode | not+ia64
+       dmidecode [amd64 i386 ia64]
        ,
        ipython
        ,
-       mcelog | not+amd64 | not+gnu-linux,
-       mcelog | not+i386 | not+gnu-linux,
+       mcelog [amd64 i386]
        ,
        htop, psmisc,
-       lsof | not+gnu-linux,
        ,
        ncdu,
        mc,
@@ -119,6 +117,7 @@ Package: debian.org-bugs.debian.org
 Architecture: all
 Depends: graphviz,
        libcgi-simple-perl,
+       libgravatar-url-perl,
        libio-stringy-perl,
        liblist-moreutils-perl,
        libmail-rfc822-address-perl,
@@ -504,9 +503,10 @@ Depends: db4.8-util,
        php5, php5-cgi, php5-cli,
                php5-ldap, php5-pgsql,
                libapache2-mod-fcgid,
-       python-apt, python-psycopg2,
+       python-apt, python-psycopg2, python-gpgme,
        libdbd-pg-ruby,
-       rrdtool
+       rrdtool,
+       raptor-utils | raptor2-utils
 Description: metapackage for qa.debian.org
  This package depends on all the packages that are needed for qa.debian.org setup.
 
@@ -774,10 +774,9 @@ Description: metapackage for piuparts.debian.org
 Package: debian.org-wiki.debian.org
 Architecture: all
 Depends: libapache2-mod-wsgi,
-        libjson-perl,
-        python-moinmoin,
-        python-launchpadlib,
-        libsoap-lite-perl
+       libjson-perl,
+       python-moinmoin,
+       python-launchpadlib,
+       libsoap-lite-perl
 Description: metapackage for wiki.debian.org
  This package depends on all the packages that are needed for the Debian wiki
-