From eaffd0dbb31861022409e4948558de43883ecf56 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 28 Jan 2017 11:54:45 +0000
Subject: Few more tweaks to integrate 3.4.2-1.1 back into Debian history
 properly.

---
 debian/changelog | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5b30f85..9610fbca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,7 @@
-bitlbee (3.5-1.1) UNRELEASED; urgency=medium
-
-  [ Michael Lustfield ]
-  * Adding build-{arch,indep} targets. (Closes: #821967)
-  * Added python to build depends.
+bitlbee (3.5-1.1) unstable; urgency=medium
 
   [ dequis ]
-  * Merge changes from 3.4.2-1.1 NMU into 3.5-1
+  * Merge back changes from 3.4.2-1.1 (Closes: #852897)
 
  -- dequis <dx@dxzone.com.ar>  Thu, 26 Jan 2017 21:39:24 -0300
 
@@ -28,6 +24,14 @@ bitlbee (3.5-1) unstable; urgency=medium
 
  -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 24 Jan 2017 22:21:33 +0000
 
+bitlbee (3.4.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Adding build-{arch,indep} targets. (Closes: #821967)
+  * Added python to build depends.
+
+ -- Michael Lustfield <michael@lustfield.net>  Mon, 18 Jul 2016 01:02:17 -0700
+
 bitlbee (3.4.2-1) unstable; urgency=medium
 
   [ Jelmer Vernooij ]
-- 
cgit v1.2.3