chiark / gitweb /
Merge branch 'kibi'
authorPeter Palfrader <peter@palfrader.org>
Sun, 24 Nov 2013 07:38:17 +0000 (08:38 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 24 Nov 2013 07:38:17 +0000 (08:38 +0100)
* kibi:
  d-i.debian.org: Adjust package list.

Conflicts:
debian/changelog

1  2 
debian/changelog
debian/control

@@@ -16,13 -16,18 +16,25 @@@ debian.org (53) UNRELEASED; urgency=lo
    * d/control: add postgresql-client to qa.debian.org
      - Apply patch from Bart Martens
  
 +  [ Enrico Zini ]
 +  * nm.d.o update:
 +    + python-lzma
 +
 +  [ 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 --cc debian/control
Simple merge