Merge branch 'kibi'

* kibi:
  d-i.debian.org: Adjust package list.

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 2fb83f50aacf8dd3582f2687a060d0d499b432f5..0221241ea8d695baf84d41a0544a68fcdc7e512d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,18 @@ debian.org (53) UNRELEASED; urgency=low
   [ Raphaël Hertzog ]
   * Add initial meta-package for tracker.debian.org.
 
+  [ Cyril Brulebois ]
+  * d-i.debian.org:
+    + libfile-slurp-perl
+    + mr
+    + gettext
+    + poxml
+    + xsltproc
+    + docbook-xml
+    + docbook-xsl
+    + graphviz
+    + edos-distcheck
+
  -- Bernhard R. Link <brlink@debian.org>  Sun, 13 Oct 2013 11:55:19 +0200
 
 debian.org (52) unstable; urgency=low

diff --git a/debian/control b/debian/control
index 4f35a65870ccc648d04f9de6eb757a7319aab3d1..8140698a78793f2cfdbf05ec445285da0963b709 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -881,8 +881,17 @@ Architecture: all
 Depends: gnuplot,
        libemail-mime-perl,
        libemail-sender-perl,
+       libfile-slurp-perl,
        liblist-moreutils-perl,
        libsort-versions-perl,
+       mr,
+       gettext,
+       poxml,
+       xsltproc,
+       docbook-xml,
+       docbook-xsl,
+       graphviz,
+       edos-distcheck,
        devscripts,
        liburi-perl,
        edos-distcheck