Merge remote branch 'adsb/master'

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index ec67e034026710c354dda4926fcd7a642558d27a..80aeda23d9921356c2092b22c2f65138f0ebded0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -76,6 +76,7 @@ Depends: debian.org,
        less,
        rsync,
        screen,
+       tmux,
        ldap-utils, ldapvi,
        mmv,
        moreutils,
@@ -203,29 +204,17 @@ Depends: debiandoc-sgml,
        libwww-perl,
        libxml2-utils,
        libxml-rss-perl,
-       littex,
        locales, locales-all,
+       lmodern,
        maildrop,
        openjade,
        openjade1.3,
        po4a,
        poxml,
        procmail,
-       python2.4,
-       python-xml,
        texlive-fonts-recommended,
-       texlive-lang-cyrillic, texlive-lang-cyrillic, latex-cjk-japanese,
-       texlive-lang-czechslovak,
-       texlive-lang-finnish,
-       texlive-lang-french,
-       texlive-lang-german,
-       texlive-lang-greek,
-       texlive-lang-italian,
-       texlive-lang-other,
-       texlive-lang-portuguese,
-       texlive-lang-spanish,
-       texlive-lang-swedish,
-       texlive-lang-vietnamese,
+       texlive-lang-all,
+       latex-cjk-japanese,
        texlive-latex-base,
        texlive-latex-extra,
        texlive-latex-recommended,
@@ -374,8 +363,8 @@ Architecture: all
 Depends: edos-debcheck,
        mutt,
        subversion,
-       python2.5,
-       python2.5-dev,
+       python2.6,
+       python2.6-dev,
        python-dev,
        devscripts,
        wdiff,
@@ -410,6 +399,7 @@ Depends: bittornado,
        zsync,
        fakeroot,
        dosfstools,
+       libsoap-lite-perl,
        devscripts
 Description: metapackage for cdbuilder
  This package depends on all the packages that are needed for a cdbuilder setup.
@@ -483,9 +473,27 @@ Depends: db4.8-util,
 Description: metapackage for qa.debian.org
  This package depends on all the packages that are needed for qa.debian.org setup.
 
+Package: debian.org-packages.qa.debian.org
+Architecture: all
+Depends: db4.7-util,
+       libmailtools-perl,
+       libmime-tools-perl,
+       libmail-verp-perl,
+       xsltproc,
+       mhonarc,
+       python,
+       python-lxml,
+       python-soappy,
+       python-debian,
+       python-yaml,
+       python-zsi
+Description: metapackage for packages.qa.debian.org
+ This package depends on all the packages that are needed for packages.qa.debian.org setup.
+
 Package: debian.org-udd.debian.org
 Architecture: all
-Depends: graphviz,
+Depends: dpkg-dev,
+       graphviz,
        libapt-pkg-dev,
        libcgi-simple-perl,
        libdbd-pg-ruby,
@@ -501,6 +509,7 @@ Depends: graphviz,
        libyaml-syck-perl,
        python-debian,
        python-dev,
+       python-launchpadlib,
        python-psycopg2,
        python-yaml
 Description: metapackage for udd.debian.org