Merge remote branch 'pkern/master'

[dsa-metapackages.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 683e86a917c4bbea41f24111d78253d49dad5133..ad9932837ebb61604d7b5d23a0b2d1c44aae7a0a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian.org (39) stable; urgency=low
+debian.org (3X) UNRELEASED; urgency=low
 
   [ Joerg Jaspert ]
   * More updates for the ftpmaster package.
@@ -6,8 +6,17 @@ debian.org (39) stable; urgency=low
   [ Martin Zobel-Helas ]
   * add syslog-ng (>= 3.1) to debian.org.
   * add acpid (>= 2.0) to debian.org-recommended.
+  * start new package debian.org-nm.debian.org
+  * add wdiff dependency to ftpmaster package.
 
- -- Martin Zobel-Helas <zobel@debian.org>  Wed, 11 Aug 2010 14:10:07 +0200
+  [ Philipp Kern ]
+  * add mutt to debian.org-recommended
+  * add debian.org-release.debian.org metapackage
+  * add python-mako to debian.org-buildd.debian.org
+  * add moreutils (>= 0.39) to debian.org-buildd.debian.org
+    (for a fixed parallel)
+
+ -- Martin Zobel-Helas <zobel@debian.org>  Tue, 31 Aug 2010 20:48:25 +0200
 
 debian.org (38) stable; urgency=low