update d/changelog to merge unreleased entries

diff --git a/debian/changelog b/debian/changelog
index e5550e2c89090b57f78940cff18a2d17a0091a39..fedd6c7d0c59152c5a3447d185e4c71aa30923b3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,14 @@
 mailtextbody (0.1.3-0.1) UNRELEASED; urgency=low
 
-  * Non-maintainer upload.
+  [ gregor herrmann ]
+  * Update Vcs-* headers.
+
+  [ Christopher Knadle ]
   * Swtich debian/rules to dh, '3.0 (quilt)' format, compat 9
+  * Update debian/copyright to reference 1.0 format
 
  -- Christopher Knadle <Chris.Knadle@coredump.us>  Sat, 30 Mar 2013 12:44:51 -0400
 
-mailtextbody (0.1.2-2) UNRELEASED; urgency=low
-
-  * Update Vcs-* headers.
-
- -- gregor herrmann <gregoa@debian.org>  Sun, 08 Jan 2012 20:56:43 +0100
-
 mailtextbody (0.1.2-1) unstable; urgency=medium
 
   * Clean up debian/rules.