sort changes and add maildrop to www-master package

[dsa-metapackages.git] / debian / control

diff --git a/debian/control b/debian/control
index 986ce80a7578ca80f17661c5d7814acc230f5e5e..9cdcf96c2a2e91319c8a1cbbee7042f2d73d0017 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Depends: debian.org,
        mtr-tiny, tcpdump, iproute, traceroute, tcptraceroute, ndisc6,
        bind9-host, dnsutils, whois
        ,
-       emacs22-nox | emacs22 | emacs21-nox | emacs21
+       emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
        ,
        at, uptimed,
        puppet,
@@ -78,7 +78,7 @@ Depends: debian.org,
        ,
        bsd-mailx
        ,
-       timeout
+       timeout | coreutils (>= 8.0-1)
        ,
        strace
        ,
@@ -94,7 +94,6 @@ Depends: debian.org,
        ,
        w3m,
        elinks,
-       ,
        mutt
 Description: metapackage to pull in recommended, but not essential tools
  This package depends on packages that are recommended to  be installed on
@@ -166,44 +165,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,
@@ -215,9 +208,16 @@ 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,
+       time,
+       ttf-arphic-uming,
+       wml,
+       xmlroff, dblatex,
+       xplanet,
+       xplanet-images,
+       xsltproc
 Description: metapackages for www-master.debian.org dependencies
  This package depends on everything that is needed for a www-master.debian.org.
 
@@ -245,7 +245,7 @@ Depends: edos-distcheck,
        python-psycopg2,
        python-mako,
        python-nose,
-       python-sqlalchemy (>= 0.5), 
+       python-sqlalchemy (>= 0.5),
        python-sqlalchemy (<< 0.6),
        quinn-diff,
        r-base-core,
@@ -387,8 +387,15 @@ Depends: libapache2-mod-php5, libapache2-mod-wsgi,
        python-lxml, python-psycopg2, python-soappy, python-virtualenv,
        python-sqlalchemy, python-simplejson,
        perl,
-       libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl, 
+       libdbi-perl, libdbd-pg-perl, libdbd-sqlite3-perl,
        procmail,
        moreutils
-Description: metapackage for nm.debian.org 
- This package depends on all the packages that are needed for nm.debian.org setup. 
+Description: metapackage for nm.debian.org
+ This package depends on all the packages that are needed for nm.debian.org setup.
+
+Package: debian.org-backports.debian.org
+Architecture: all
+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.