Update .gitignore

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 19da1b208540ba140140db797c172376ab1b80ac..f78b9941de713ba677a180518abf447551e54a82 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Depends: debian.org,
                git-svn,
                subversion-tools,
                mercurial,
+               cvs
        ,
        mtr-tiny, tcpdump, tcptraceroute, ndisc6,
        traceroute | not+gnu-linux,
@@ -77,6 +78,7 @@ Depends: debian.org,
        mmv,
        moreutils,
        patchutils,
+       diffstat,
        netcat-openbsd, socat, telnet
        ,
        deborphan
@@ -187,6 +189,7 @@ Depends: debiandoc-sgml,
        latex-cjk-all,
        latex-cjk-chinese,
        ldap-utils,
+       libintl-perl,
        libnet-ldap-perl,
        libtimedate-perl,
        libwww-perl,
@@ -226,7 +229,8 @@ Depends: debiandoc-sgml,
        xmlroff, dblatex,
        xplanet,
        xplanet-images,
-       xsltproc
+       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.
 
@@ -254,12 +258,10 @@ Depends: edos-distcheck,
        python-psycopg2,
        python-mako,
        python-nose,
-       python-sqlalchemy (>= 0.5),
-       python-sqlalchemy (<< 0.6),
+       python-sqlalchemy,
        quinn-diff,
        r-base-core,
        r-cran-lattice,
-       postgresql-8.4, postgresql-8.4-debversion,
        php5,
        moreutils (>= 0.39~)
 Description: metapackages for buildd.debian.org dependencies
@@ -315,8 +317,9 @@ Depends: apt-utils,
        python-psycopg2,
        python-pygresql,
        python-pyrss2gen,
+       python-simplejson | python (>= 2.6),
        python-yaml,
-       python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6),
+       python-sqlalchemy,
        binutils-multiarch,
        build-essential,
        devscripts,
@@ -333,7 +336,6 @@ Depends: apt-utils,
        procmail,
        cvs,
        ruby,
-       irb,
        lynx,
        libxml-rss-perl,
        ghostscript,