add diffstat to debian.org-recommended

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 4bebfa10d40bc781943b9a7989a5192b91ae5742..8a53d37cced344495d73b24d5aa53bc8073fd6b0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Description: metapackage to pull in recommended, but not essential tools for lin
 Package: debian.org-recommended
 Architecture: all
 Depends: debian.org,
+       busybox-static,
        debian.org-recommended-linux | not+gnu-linux,
        molly-guard
        ,
@@ -53,13 +54,16 @@ Depends: debian.org,
        ,
        dsa-nagios-checks
        ,
-       lshw,
+       lshw | not+gnu-linux,
        dmidecode | not+amd64,
        dmidecode | not+i386,
        dmidecode | not+ia64
        ,
+       ipython
+       ,
        mcelog | not+amd64 | not+gnu-linux,
-       mcelog | not+i386 | not+gnu-linux
+       mcelog | not+i386 | not+gnu-linux,
+       lsscsi
        ,
        htop, psmisc,
        lsof | not+gnu-linux,
@@ -73,6 +77,7 @@ Depends: debian.org,
        mmv,
        moreutils,
        patchutils,
+       diffstat,
        netcat-openbsd, socat, telnet
        ,
        deborphan
@@ -168,44 +173,38 @@ Description: metapackages for packages.debian.org dependencies
 Package: debian.org-www-master.debian.org
 Architecture: all
 Depends: debiandoc-sgml,
-       dpkg-dev,
+       asciidoc,
+       cm-super,
+       debhelper,
+       docbook,
+       docbook-dsssl,
        docbook-xsl,
+       dpkg-dev,
        gettext,
        ghostscript,
+       jadetex,
        kcc,
-       xmlroff, dblatex,
-       locales, locales-all,
-       latex-cjk-chinese,
+       ko.tex-base,
        latex-cjk-all,
+       latex-cjk-chinese,
+       ldap-utils,
        libnet-ldap-perl,
        libtimedate-perl,
        libwww-perl,
+       libxml2-utils,
        libxml-rss-perl,
        littex,
+       locales, locales-all,
+       maildrop,
+       openjade,
+       openjade1.3,
        po4a,
        poxml,
-       python-xml,
+       procmail,
        python2.4,
+       python-xml,
        texlive-fonts-recommended,
        texlive-lang-cyrillic, texlive-lang-cyrillic, latex-cjk-japanese,
-       texlive-latex-base,
-       texlive-latex-extra,
-       texlive-latex-recommended,
-       time,
-       wml,
-       xplanet,
-       xplanet-images,
-       xsltproc,
-       procmail,
-       ldap-utils,
-       asciidoc,
-       libxml2-utils,
-       debhelper,
-       docbook,
-       jadetex,
-       openjade,
-       openjade1.3,
-       docbook-dsssl,
        texlive-lang-czechslovak,
        texlive-lang-finnish,
        texlive-lang-french,
@@ -217,9 +216,19 @@ Depends: debiandoc-sgml,
        texlive-lang-spanish,
        texlive-lang-swedish,
        texlive-lang-vietnamese,
-       ko.tex-base,
-       cm-super,
-       ttf-arphic-uming
+       texlive-latex-base,
+       texlive-latex-extra,
+       texlive-latex-recommended,
+       tidy,
+       time,
+       ttf-arphic-uming,
+       ttf-malayalam-fonts,
+       wml,
+       xmlroff, dblatex,
+       xplanet,
+       xplanet-images,
+       xsltproc,
+       libjson-perl
 Description: metapackages for www-master.debian.org dependencies
  This package depends on everything that is needed for a www-master.debian.org.
 
@@ -299,7 +308,7 @@ Architecture: all
 Depends: apt-utils,
        libapt-pkg-dev,
        python-apt,
-       python-btsutils,
+       python-debianbts (>= 1.4~bpo50+1),
        lintian,
        python,
        python-debian,
@@ -308,6 +317,7 @@ Depends: apt-utils,
        python-psycopg2,
        python-pygresql,
        python-pyrss2gen,
+       python-simplejson || python (>= 2.6),
        python-yaml,
        python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
        binutils-multiarch,
@@ -331,7 +341,8 @@ Depends: apt-utils,
        libxml-rss-perl,
        ghostscript,
        perforate,
-       wdiff
+       wdiff,
+       xz-utils (>= 4.999.9beta+20100713-1~bpo50+1)
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
 
@@ -363,7 +374,8 @@ Depends: bittornado,
        tofrodos,
        zip,
        zsync,
-       fakeroot
+       fakeroot,
+       dosfstools
 Description: metapackage for cdbuilder
  This package depends on all the packages that are needed for a cdbuilder setup.
 
@@ -387,7 +399,8 @@ Depends: libapache2-mod-php5, libapache2-mod-wsgi,
        python-dnspython, python-egenix-mxdatetime, python-egenix-mxtools,
        python-elementtree | python (>= 2.6), python-flup, python-libxml2,
        python-lxml, python-psycopg2, python-soappy, python-virtualenv,
-       python-sqlalchemy, python-simplejson,
+       python-sqlalchemy (>= 0.6), python (>= 2.5.4-5~) | python-simplejson,
+       python-flask (>= 0.6), python-flaskext.wtf, python-wtforms,
        perl,
        libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl,
        procmail,
@@ -401,3 +414,28 @@ Depends: debian.org-ftpmaster.debian.org,
        libdbi-perl, libdbd-pg-perl
 Description: metapackage for backports.debian.org
  This package depends on all the packages that are needed for backports.debian.org setup.
+
+Package: debian.org-qa.debian.org
+Architecture: all
+Depends: db4.8-util,
+       gnuplot-nox,
+       wml,
+       libapt-pkg-perl,
+               libdbd-pg-perl,
+               libdate-manip-perl,
+               libdpkg-perl,
+               libmailtools-perl,
+               libsoap-lite-perl,
+               libtemplate-perl,
+               libxml-simple-perl,
+               libmail-sendmail-perl,
+               libdate-calc-perl,
+               libnet-ldap-perl,
+       php5, php5-cgi, php5-cli,
+               php5-ldap, php5-pgsql,
+               libapache2-mod-fcgid,
+       python-apt, python-psycopg2,
+       libdbd-pg-ruby,
+       rrdtool
+Description: metapackage for qa.debian.org
+ This package depends on all the packages that are needed for qa.debian.org setup.