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 --cc 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 --cc debian/control
Simple merge