Merge branch 'master' of ssh://db.debian.org/git/debian.org

diff --combined debian/control
index 9cdcf96c2a2e91319c8a1cbbee7042f2d73d0017,7f17e84575c79cda4d8ceded7bf00a579714fd04..7e7c6cec4bc3ba0d463ebc00b98eded654044918
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -16,25 -16,29 +16,29 @@@ Description: DSA's host metapackag
   debian.org host, and conflicts with packages that should never be
   installed.
  
+ Package: debian.org-recommended-linux
+ Architecture: all
+ Depends: vlan, ifenslave, bridge-utils, iproute,
+       strace
+ Description: metapackage to pull in recommended, but not essential tools for linux system
+  This package depends on packages that are recommended to  be installed on
+  every Linux debian.org host but are not essential.
+ 
  Package: debian.org-recommended
  Architecture: all
  Depends: debian.org,
+       debian.org-recommended-linux | not+gnu-linux,
        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,
                mercurial,
        ,
-       mtr-tiny, tcpdump, iproute, traceroute, tcptraceroute, ndisc6,
+       mtr-tiny, tcpdump, tcptraceroute, ndisc6,
+       traceroute | not+gnu-linux,
        bind9-host, dnsutils, whois
        ,
        emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
@@@ -49,15 -53,16 +53,16 @@@
        ,
        dsa-nagios-checks
        ,
-       lshw,
+       lshw | not+gnu-linux,
        dmidecode | not+amd64,
        dmidecode | not+i386,
        dmidecode | not+ia64
        ,
-       mcelog | not+amd64,
-       mcelog | not+i386
+       mcelog | not+amd64 | not+gnu-linux,
+       mcelog | not+i386 | not+gnu-linux
        ,
-       htop, lsof, psmisc
+       htop, psmisc,
+       lsof | not+gnu-linux,
        ,
        mc,
                genisoimage,
@@@ -80,8 -85,6 +85,6 @@@
        ,
        timeout | coreutils (>= 8.0-1)
        ,
-       strace
-       ,
        wget, curl, lftp, ftp,
        ,
        dput
@@@ -165,38 -168,44 +168,38 @@@ Description: metapackages for packages.
  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,
@@@ -208,16 -217,9 +211,16 @@@
        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.
  
@@@ -252,7 -254,7 +255,7 @@@ Depends: edos-distcheck
        r-cran-lattice,
        postgresql-8.4, postgresql-8.4-debversion,
        php5,
-       moreutils (>= 0.39)
+       moreutils (>= 0.39~)
  Description: metapackages for buildd.debian.org dependencies
   This package depends on everything that is needed for a buildd.debian.org.