From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 28 Feb 2010 16:22:16 +0000 (+0100)
Subject: Merge branch 'master' of http://kosh.ganneff.de/~joerg/debian.org
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=427c0aa36c6849fa5a83658b65c6a9c727a27da9;p=dsa-metapackages.git

Merge branch 'master' of kosh.ganneff.de/~joerg/debian.org

* 'master' of http://kosh.ganneff.de/~joerg/debian.org:
  Add a changelog entry
  python instead of python2.4.
  editor extensions are unwanted
  mc is already in -recommends
  No more gpgv
  Fixup apt-utils depends
  Add a first version for an ftpmaster.d.o metapackage
  Update the planet.debian.org metapackage

Conflicts:

	debian/changelog
---

427c0aa36c6849fa5a83658b65c6a9c727a27da9
diff --cc debian/changelog
index e686fe0,fe7132e..e6b12c9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
 -debian.org (32) stable; urgency=low
++debian.org (XX) XXable; urgency=low
+ 
+   [ Joerg Jaspert]
+   * Update the planet.debian.org metapackage, adding timeout,
+     debianutils, python-django, python as dependencies.
+   * Add an ftpmaster metapackage
+ 
+  -- Joerg Jaspert <joerg@debian.org>  Sat, 27 Feb 2010 11:54:20 +0100
+ 
 +debian.org (32) stable; urgency=low
 +
 +  * Fix install target of Makefile to deal with usr/bin.
 +
 + -- Peter Palfrader <weasel@debian.org>  Sun, 21 Feb 2010 17:22:03 +0100
 +
  debian.org (31) stable; urgency=low
  
    [ Martin Zobel-Helas ]