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 --git a/.gitignore b/.gitignore
index 08c7e92c2d38cb3fdc251ad9b4244d1537a00c71..6fad968f6aa47a9614f438a2882e341d35c8ec11 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,15 @@
+debian/debian.org-bugs.debian.org-mx.debhelper.log
+debian/debian.org-bugs.debian.org-mx/
 debian/debian.org-bugs.debian.org.debhelper.log
 debian/debian.org-bugs.debian.org/
 debian/debian.org-buildd.debian.org.debhelper.log
 debian/debian.org-buildd.debian.org/
 debian/debian.org-packages.debian.org.debhelper.log
 debian/debian.org-packages.debian.org/
-debian/debian.org-planet.debian.org.debhelper.log
-debian/debian.org-planet.debian.org/
 debian/debian.org-patch-tracker.debian.org.debhelper.log
 debian/debian.org-patch-tracker.debian.org/
+debian/debian.org-planet.debian.org.debhelper.log
+debian/debian.org-planet.debian.org/
 debian/debian.org-recommended.debhelper.log
 debian/debian.org-recommended/
 debian/debian.org-testing-security.debian.org.debhelper.log

diff --git a/debian/changelog b/debian/changelog
index fd9e371df555d5fbe742e1a59481d9c3ddae604e..cfac9a1360c0ee688b888033144e2bd3d086fc3f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 debian.org (30) UNRELEASED; urgency=low
 
+  [ Martin Zobel-Helas ]
   * New dependencies of debian.org-recommended:
     - whois
   * New dependencies of debian.org-www-master:
@@ -28,7 +29,13 @@ debian.org (30) UNRELEASED; urgency=low
     - ko.tex-base
     - cm-super
 
- -- Martin Zobel-Helas <zobel@debian.org>  Mon, 04 Jan 2010 11:31:08 +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 --git a/debian/control b/debian/control
index 98dda585fb397834f3297ef3333fb94832ffdc1f..2bd40da26771f67b8df881a627844596a9aa7b40 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -73,7 +73,7 @@ Depends: debian.org,
        ,
        strace
        ,
-       wget, curl, lftp
+       wget, curl, lftp, ftp,
        ,
        dput
        ,
@@ -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