Make debian.org-recommended arch any so we can replace type-handling dependencies...

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index a1a9c7e664314e676a6b95ecb1d3274cd0f760e1..0d756cca6b672c5ce8c7fc619f7d283271e8ad42 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
@@ -27,10 +27,10 @@ Description: metapackage to pull in recommended, but not essential tools for lin
  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 +41,9 @@ 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, bwm-ng,
+       traceroute [linux-any],
+       iputils-tracepath [linux-any],
        bind9-host, dnsutils, whois, unbound-host
        ,
        emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
@@ -58,18 +58,15 @@ Depends: debian.org,
        ,
        dsa-nagios-checks
        ,
-       lshw | not+gnu-linux,
-       dmidecode | not+amd64,
-       dmidecode | not+i386,
-       dmidecode | not+ia64
+       lshw [linux-any],
+       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,
+       lsof [linux-any],
        ,
        ncdu,
        mc,
@@ -130,6 +127,7 @@ Depends: graphviz,
        liburi-perl,
        libhtml-tree-perl,
        libsoap-lite-perl,
+       libtext-iconv-perl,
        libdbd-pg-perl,
        python-pyinotify,
        python-yaml
@@ -142,6 +140,7 @@ Architecture: all
 Depends: debian.org-bugs.debian.org,
        gnuplot,
        ttf-liberation,
+       kgb-client-git,
        lynx    
 Description: metapackages for bugs-master.debian.org dependencies
  This package depends on everything that is needed for a
@@ -409,6 +408,8 @@ Depends: edos-debcheck,
        picosat,
        openjdk-6-jre-headless,
        git-email,
+       python-networkx,
+       python-pygraphviz,
 Description: metapackage for release
  This package depends on everything that is needed for a release.debian.org
  setup.
@@ -428,7 +429,7 @@ Depends: bittornado,
        dosfstools,
        libsoap-lite-perl,
        devscripts,
-    mtools
+       mtools
 Description: metapackage for cdbuilder
  This package depends on all the packages that are needed for a cdbuilder setup.
 
@@ -502,7 +503,8 @@ Depends: db4.8-util,
                libapache2-mod-fcgid,
        python-apt, python-psycopg2,
        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.
 
@@ -579,9 +581,11 @@ Depends:   binutils,
        diffstat,
        dpkg-dev,
        debhelper,
+       devscripts,
        fakeroot,
        file,
        gettext,
+       gnuplot-nox | gnuplot,
        intltool-debian,
        libapt-pkg-perl,
        libarchive-zip-perl,
@@ -600,6 +604,7 @@ Depends:   binutils,
        locales,
        man-db,
        perl,
+       t1utils,
        unzip,
        xz-utils
        ,
@@ -740,3 +745,36 @@ Depends: gettext,
        rrdtool
 Description: metapackages for l10n.debian.org dependencies
  This package depends on everything that is needed for l10n.debian.org.
+
+Package: debian.org-piuparts.debian.org
+Architecture: all
+Depends: asciidoc,
+       git,
+       xmlto,
+       debootstrap,
+       debsums,
+       lsb-release,
+       lsof,
+       python-debian,
+       python-debianbts,
+       apache2,
+       ghostscript,
+       python-rpy,
+       r-base-dev,
+       r-recommended,
+       tango-icon-theme,
+       screen,
+       python-apt
+Description: metapackage for piuparts.debian.org
+ This package depends on all the packages that are needed for the
+ piuparts.debian.org setup.
+
+Package: debian.org-wiki.debian.org
+Architecture: all
+Depends: libapache2-mod-wsgi,
+       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