fix up changelog for unstable release

also resolve a historical inaccuracy caused by a diverging
history.

diff --git a/debian/changelog b/debian/changelog
index 190c0912945a6d32678aba933cfa93630cfdf5af..0c809d21d83b206cdfd80458846f0214932ed122 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bup (0.25~git2011.11.04-5) unstable; urgency=low
+
+  * Add 0.22a-1 changelog entry to this file. Remove changelog
+    entry for  0.21-1 which was never uploaded.  Closes: #665650.
+  * The experimental upload appears to have worked!
+    Closes: #664185, #668997.
+
+ -- Jon Dowland <jmtd@debian.org>  Fri, 25 May 2012 11:55:14 +0100
+
 bup (0.25~git2011.11.04-4) experimental; urgency=low
 
   * Bump standards version.
@@ -61,11 +70,11 @@ bup (0.24b-1) unstable; urgency=low
 
  -- Jon Dowland <jmtd@debian.org>  Fri, 08 Jul 2011 09:55:48 +0100
 
-bup (0.21-1) unstable; urgency=low
+bup (0.22a-1) unstable; urgency=low
 
   * New upstream version. Closes: #610690.
 
- -- Jon Dowland <jmtd@debian.org>  Mon, 24 Jan 2011 22:47:11 +0000
+ -- Jon Dowland <jmtd@debian.org>  Mon, 07 Feb 2011 22:40:44 +0000
 
 bup (0.20-2) unstable; urgency=low