diff -pruN 111/debian/changelog 111ubuntu1/debian/changelog
--- 111/debian/changelog	2019-02-10 12:09:26.000000000 +0000
+++ 111ubuntu1/debian/changelog	2019-02-11 17:28:11.000000000 +0000
@@ -1,3 +1,11 @@
+diffoscope (111ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Temporarily disable the fsimage tests during autopkgtest.
+    - tweak rules to allow different changelog and version
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 11 Feb 2019 18:28:11 +0100
+
 diffoscope (111) unstable; urgency=medium
 
   * Fix a regression introduced via #920701 where we stopped using the -dbgsym
@@ -29,6 +37,24 @@ diffoscope (110) unstable; urgency=mediu
 
  -- Chris Lamb <lamby@debian.org>  Wed, 06 Feb 2019 17:33:09 +0100
 
+diffoscope (108ubuntu3) disco; urgency=medium
+
+  * Temporarily disable the fsimage tests during autopkgtest.
+
+ -- Mattia Rizzolo <mapreri@ubuntu.com>  Wed, 23 Jan 2019 23:48:20 +0100
+
+diffoscope (108ubuntu2) disco; urgency=medium
+
+  * Try to increase the memory available to qemu, still debugging ppc64el.
+
+ -- Mattia Rizzolo <mapreri@ubuntu.com>  Wed, 23 Jan 2019 21:22:30 +0100
+
+diffoscope (108ubuntu1) disco; urgency=medium
+
+  * Try to debug guestfs failures on ppc64el's autopkgtest.
+
+ -- Mattia Rizzolo <mapreri@ubuntu.com>  Wed, 23 Jan 2019 16:51:39 +0100
+
 diffoscope (108) unstable; urgency=medium
 
   [ Chris Lamb ]
diff -pruN 111/debian/rules 111ubuntu1/debian/rules
--- 111/debian/rules	2019-02-10 12:09:26.000000000 +0000
+++ 111ubuntu1/debian/rules	2019-02-11 17:28:11.000000000 +0000
@@ -13,7 +13,11 @@ ifneq ($(DEB_VERSION),$(PY_VERSION))
      $(error Version in debian/changelog does not match diffoscope version or backport policy)
     endif
   else
-   $(error Version in debian/changelog does not match diffoscope version)
+    ifeq ($(DEB_DISTRIBUTION),disco)
+     $(info "Ubuntu gets to do whatever they want ☺")
+    else
+     $(error Version in debian/changelog does not match diffoscope version)
+    endif
   endif
  endif
 endif
diff -pruN 111/debian/tests/pytest 111ubuntu1/debian/tests/pytest
--- 111/debian/tests/pytest	2019-02-10 12:09:26.000000000 +0000
+++ 111ubuntu1/debian/tests/pytest	2019-02-11 16:15:22.000000000 +0000
@@ -10,4 +10,4 @@ fi
 export LIBGUESTFS_MEMSIZE=128
 
 cp -r tests $ADTTMP
-(cd $ADTTMP; py.test-3 -vv -l -r a)
+(cd $ADTTMP; py.test-3 -vv -l -r a -k "not fsimage")
diff -pruN 111/debian/tests/pytest-with-recommends 111ubuntu1/debian/tests/pytest-with-recommends
--- 111/debian/tests/pytest-with-recommends	2019-02-10 12:09:26.000000000 +0000
+++ 111ubuntu1/debian/tests/pytest-with-recommends	2019-02-11 16:15:22.000000000 +0000
@@ -10,4 +10,4 @@ fi
 export LIBGUESTFS_MEMSIZE=128
 
 cp -r tests $ADTTMP
-(cd $ADTTMP; py.test-3 -vv -l -r a)
+(cd $ADTTMP; py.test-3 -vv -l -r a -k "not fsimage")