fix debian/control

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 8b3585cbccbc7fe7093b6d55924a908a563dc4fb..0479560a8cce9ef4ead7fe266b11834987bce2f6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: debian.org
 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>
+Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>, Stephen Gran <sgran@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, libpam-pwdfile, vim, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate
+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)
 Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
 Description: DSA's host metapackage
@@ -21,21 +21,30 @@ Architecture: all
 Depends: debian.org,
        molly-guard
        ,
+       acpid (>= 2.0) | not+amd64,
+       acpid (>= 2.0) | not+i386,
+       acpid (>= 2.0) | not+ia64,
+       ,
        man-db
        ,
        vlan, ifenslave, bridge-utils
        ,
        subversion, rcs, git-core, bzr,
                git-svn,
-               subversion-tools
+               subversion-tools,
+               mercurial,
        ,
        mtr-tiny, tcpdump, iproute, traceroute, tcptraceroute, ndisc6,
        bind9-host, dnsutils, whois
        ,
        emacs22-nox | emacs22 | emacs21-nox | emacs21
        ,
-       at, uptimed, irqbalance,
+       at, uptimed,
        puppet,
+               libaugeas-ruby,
+               libaugeas-ruby1.8,
+               libaugeas0,
+               augeas-lenses (>= 0.7),
        locate, dlocate
        ,
        dsa-nagios-checks
@@ -102,7 +111,10 @@ Depends: graphviz,
        libtext-template-perl,
        liburi-perl,
        libhtml-tree-perl,
-       libsoap-lite-perl
+       libsoap-lite-perl,
+       libdbd-pg-perl,
+       python-pyinotify,
+       python-yaml
 Description: metapackages for bugs.debian.org dependencies
  This package depends on everything that is needed for a bugs.debian.org
  mirror or (in the future) bugs-master.
@@ -210,8 +222,8 @@ Description: metapackages for www-master.debian.org dependencies
 
 Package: debian.org-buildd.debian.org
 Architecture: all
-Depends: edos-debcheck,
-       db4.7-util,
+Depends: edos-distcheck,
+       db4.8-util,
        ghostscript,
        libcompress-bzip2-perl,
        libcompress-zlib-perl,
@@ -219,6 +231,7 @@ Depends: edos-debcheck,
        libmailtools-perl,
        libdbi-perl,
        libdbd-pg-perl,
+       libfile-spec-perl,
        libstring-escape-perl,
        libstring-format-perl,
        libyaml-tiny-perl,
@@ -228,11 +241,14 @@ Depends: edos-debcheck,
        python-coverage-test-runner,
        python-debian,
        python-psycopg2,
-       python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6)
+       python-nose,
+       python-sqlalchemy (>= 0.5), 
+       python-sqlalchemy (<< 0.6),
        quinn-diff,
        r-base-core,
        r-cran-lattice,
-       postgresql-8.4, postgresql-8.4-debversion
+       postgresql-8.4, postgresql-8.4-debversion,
+       php5
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.
 
@@ -287,7 +303,7 @@ Depends: apt-utils,
        python-pygresql,
        python-pyrss2gen,
        python-yaml,
-       python-sqlalchemy,
+       python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
        binutils-multiarch,
        build-essential,
        devscripts,
@@ -304,7 +320,11 @@ Depends: apt-utils,
        procmail,
        cvs,
        ruby,
-       irb
+       irb,
+       lynx,
+       libxml-rss-perl,
+       ghostscript,
+       perforate
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
 
@@ -317,6 +337,7 @@ Depends: bittornado,
        jigit,
        m4,
        tofrodos,
+       zip,
        zsync,
        fakeroot
 Description: metapackage for cdbuilder
@@ -328,3 +349,9 @@ Depends: locales-all,
        gs-common
 Description: metapackage for manpages
  This package depends on all the packages that are needed for manpages.d.o setup.
+
+Package: debian.org-nm.debian.org
+Architecture: all
+Depends: postgresql-8.4
+Description: metapackage for nm.debian.org 
+ This package depends on all the packages that are needed for nm.debian.org setup.