ack nmu

diff --git a/debian/changelog b/debian/changelog
index 6c9a29366241e43c31d41ebddd03640d914442e7..ede6f7dfdc82df8e2179bba1f2782910e55a0fbc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 bup (0.25~git2011.11.04-1) unstable; urgency=low
 
+  [ Teemu Ikonen ]
   * New upstream version.
   * Add a proper patch 'no-werror' for the previous NMU, fixing FTBFS
     (closes: #643060).
@@ -9,7 +10,11 @@ bup (0.25~git2011.11.04-1) unstable; urgency=low
     - override dh_auto_configure: Call ./configure without arguments.
     - override dh_auto_clean: Remove files generated by configure.
 
- -- Teemu Ikonen <tpikonen@gmail.com>  Sat, 19 Nov 2011 21:30:57 +0100
+  [ Jon Dowland ]
+  * Acknowledge NMU. Thanks Julien Cristau!
+  * We've merged upstream commit 8953dc8, two ahead of 0.25-rc1
+
+ -- Jon Dowland <jmtd@debian.org>  Thu, 01 Dec 2011 22:08:58 +0000
 
 bup (0.24b-1.1) unstable; urgency=low