diff -pruN 0.36-2/debian/changelog 0.36-2ubuntu2/debian/changelog
--- 0.36-2/debian/changelog	2020-10-29 09:20:33.000000000 +0000
+++ 0.36-2ubuntu2/debian/changelog	2021-09-11 04:53:23.000000000 +0000
@@ -1,3 +1,17 @@
+xmobar (0.36-2ubuntu2) impish; urgency=medium
+
+  * No-change rebuild for libffi soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 11 Sep 2021 06:53:23 +0200
+
+xmobar (0.36-2ubuntu1) hirsute; urgency=medium
+
+  * Merge newer version from Debian (LP: #1902343)
+  * Remaining changes:
+    d/tests/xmobar: wait a little longer for X server to be ready.
+
+ -- Hans Joachim Desserud <ubuntu@desserud.org>  Tue, 10 Nov 2020 17:54:51 +0100
+
 xmobar (0.36-2) unstable; urgency=medium
 
   * Move maintenance under DHG
@@ -15,6 +29,18 @@ xmobar (0.36-1) unstable; urgency=medium
   * d/rules: replace with_conduit w/ with_weather
 
  -- Apollon Oikonomopoulos <apoikos@debian.org>  Wed, 28 Oct 2020 13:41:25 +0200
+ 
+ xmobar (0.33-1ubuntu1) groovy; urgency=medium
+
+  * d/tests/xmobar: wait a little longer for X server to be ready.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 12 Oct 2020 16:38:08 +1300
+
+xmobar (0.33-1build1) groovy; urgency=medium
+
+  * No-change rebuild against libffi8ubuntu1
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 27 Aug 2020 00:15:49 +0000
 
 xmobar (0.33-1) unstable; urgency=medium
 
diff -pruN 0.36-2/debian/control 0.36-2ubuntu2/debian/control
--- 0.36-2/debian/control	2020-10-29 09:18:09.000000000 +0000
+++ 0.36-2ubuntu2/debian/control	2020-11-10 16:54:51.000000000 +0000
@@ -1,7 +1,8 @@
 Source: xmobar
 Section: x11
 Priority: optional
-Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
 Uploaders: Apollon Oikonomopoulos <apoikos@debian.org>,
            Aggelos Avgerinos <evaggelos.avgerinos@gmail.com>,
 Standards-Version: 4.5.0
diff -pruN 0.36-2/debian/tests/xmobar 0.36-2ubuntu2/debian/tests/xmobar
--- 0.36-2/debian/tests/xmobar	2020-10-29 09:07:53.000000000 +0000
+++ 0.36-2ubuntu2/debian/tests/xmobar	2020-10-12 03:25:23.000000000 +0000
@@ -15,6 +15,8 @@ for i in $(seq 1 30); do
 done
 echo
 
+sleep 5
+
 xmobar /usr/share/doc/xmobar/examples/xmobar.config &
 xmobar_pid=$!