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

* 'master' of ssh://db.debian.org/git/debian.org:
  adding build-deps of installation-guide
  add xmlroff and dblatex to debian.org-www-master
  add latex-cjk-all to debian.org-www-master
  New dependencies of debian.org-recommended: whois && New dependencies of debian.org-www-master: locales,locales-all

Conflicts:

	debian/changelog

diff --combined debian/changelog
index 2025ea1547f1d0699e31542779dccb68afeb9117,fd9e371df555d5fbe742e1a59481d9c3ddae604e..cfac9a1360c0ee688b888033144e2bd3d086fc3f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,34 +1,41 @@@
- debian.org (30XX) stable; urgency=low
+ debian.org (30) UNRELEASED; urgency=low
  
 - -- Martin Zobel-Helas <zobel@debian.org>  Mon, 04 Jan 2010 11:31:08 +0100
++  [ Martin Zobel-Helas ]
+   * New dependencies of debian.org-recommended:
+     - whois
+   * New dependencies of debian.org-www-master:
+     - locales
+     - locales-all
+     - latex-cjk-all
+     - dblatex
+     - xmlroff
+     - debhelper
+     - docbook
+     - jadetex
+     - openjade
+     - openjade1.3
+     - docbook-dsssl
+     - 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
+     - ko.tex-base
+     - cm-super
+ 
-  -- Peter Palfrader <weasel@debian.org>  Sat, 23 Jan 2010 14:05:47 +0100
++  [ Peter Palfrader ]
 +  * New dependencies of debian.org-packages.debian.org:
 +    - libtimedate-perl
 +  * New dependencies of debian.org-recommended:
 +    - ftp
 +
++ -- Peter Palfrader <weasel@debian.org>  Sat, 23 Jan 2010 14:07:36 +0100
  
  debian.org (29) stable; urgency=low
  

diff --combined debian/control
index 9ec882a3d19a11fe0fdb8ce737dd99c381847031,98dda585fb397834f3297ef3333fb94832ffdc1f..2bd40da26771f67b8df881a627844596a9aa7b40
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -30,7 -30,7 +30,7 @@@ Depends: debian.org
                subversion-tools
        ,
        mtr-tiny, tcpdump, iproute, traceroute, tcptraceroute, ndisc6,
-       bind9-host, dnsutils
+       bind9-host, dnsutils, whois
        ,
        emacs22-nox | emacs22 | emacs21-nox | emacs21
        ,
@@@ -73,7 -73,7 +73,7 @@@
        ,
        strace
        ,
 -      wget, curl, lftp
 +      wget, curl, lftp, ftp,
        ,
        dput
        ,
@@@ -142,7 -142,6 +142,7 @@@ Depends: db4.6-util
        libtemplate-perl,
        liblingua-stem-perl,
        libsearch-xapian-perl,
 +      libtimedate-perl,
        libapache2-mod-perl2,
        libapache2-reload-perl
  Description: metapackages for packages.debian.org dependencies
@@@ -157,7 -156,10 +157,10 @@@ Depends: debiandoc-sgml
        gettext,
        ghostscript,
        kcc,
+         xmlroff, dblatex,
+       locales, locales-all
        latex-cjk-chinese,
+         latex-cjk-all,
        libnet-ldap-perl,
        libtimedate-perl,
        libwww-perl,
@@@ -180,7 -182,26 +183,26 @@@
        procmail,
        ldap-utils,
        asciidoc,
-       libxml2-utils
+       libxml2-utils,
+       debhelper,
+       docbook,
+       jadetex,
+       openjade,
+       openjade1.3,
+       docbook-dsssl,
+       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,
+       ko.tex-base,
+       cm-super
  Description: metapackages for www-master.debian.org dependencies
   This package depends on everything that is needed for a www-master.debian.org.