diff -pruN 2.2.1-1/debian/changelog 2.2.1-1ubuntu1/debian/changelog
--- 2.2.1-1/debian/changelog	2017-09-26 19:34:28.000000000 +0000
+++ 2.2.1-1ubuntu1/debian/changelog	2018-02-02 20:53:46.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-compress (2.2.1-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/tests_dont_rely_on_directory_order.patch: don't rely
+    on directory order.  Thanks to Remi Collet <remi@remirepo.net>.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Fri, 02 Feb 2018 12:53:46 -0800
+
 php-horde-compress (2.2.1-1) unstable; urgency=medium
 
   * New upstream version 2.2.1
diff -pruN 2.2.1-1/debian/control 2.2.1-1ubuntu1/debian/control
--- 2.2.1-1/debian/control	2017-09-26 19:34:28.000000000 +0000
+++ 2.2.1-1ubuntu1/debian/control	2018-02-02 20:53:46.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-compress
 Section: php
 Priority: extra
-Maintainer: Horde Maintainers <pkg-horde-hackers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Horde Maintainers <pkg-horde-hackers@lists.alioth.debian.org>
 Uploaders: Mathieu Parent <sathieu@debian.org>
 Build-Depends: debhelper (>= 9), pkg-php-tools, pear-horde-channel
 Standards-Version: 3.9.8
diff -pruN 2.2.1-1/debian/patches/series 2.2.1-1ubuntu1/debian/patches/series
--- 2.2.1-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.2.1-1ubuntu1/debian/patches/series	2018-02-02 20:50:44.000000000 +0000
@@ -0,0 +1 @@
+tests_dont_rely_on_directory_order.patch
diff -pruN 2.2.1-1/debian/patches/tests_dont_rely_on_directory_order.patch 2.2.1-1ubuntu1/debian/patches/tests_dont_rely_on_directory_order.patch
--- 2.2.1-1/debian/patches/tests_dont_rely_on_directory_order.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.2.1-1ubuntu1/debian/patches/tests_dont_rely_on_directory_order.patch	2018-02-02 20:53:41.000000000 +0000
@@ -0,0 +1,29 @@
+Description: don't rely on directory order
+Author: Remi Collet <remi@remirepo.net>
+Origin: upstream, https://github.com/horde/Compress/commit/795f908809c4181b7d267bc9df3682e3b4ed45d0.patch
+Last-Update: 2018-02-02
+
+--- php-horde-compress-2.2.1.orig/Horde_Compress-2.2.1/test/Horde/Compress/TarTest.php
++++ php-horde-compress-2.2.1/Horde_Compress-2.2.1/test/Horde/Compress/TarTest.php
+@@ -111,6 +111,9 @@ class Horde_Compress_TarTest extends Hor
+         $this->assertNotEmpty($tar_data);
+ 
+         $list = $compress->decompress($tar_data);
++        usort($list, function ($a, $b) {
++            return strcmp($a['name'], $b['name']);
++        });
+         $this->assertCount(3, $list);
+         $this->assertEquals('one.txt', $list[0]['name']);
+         $this->assertEquals(4, $list[0]['size']);
+--- php-horde-compress-2.2.1.orig/Horde_Compress-2.2.1/test/Horde/Compress/ZipTest.php
++++ php-horde-compress-2.2.1/Horde_Compress-2.2.1/test/Horde/Compress/ZipTest.php
+@@ -142,6 +142,9 @@ class Horde_Compress_ZipTest extends Hor
+         $list = $compress->decompress(
+             $zip_data, array('action' => Horde_Compress_Zip::ZIP_LIST)
+         );
++        usort($list, function ($a, $b) {
++           return strcmp($a['name'], $b['name']);
++        });
+         $this->assertCount(3, $list);
+         $this->assertEquals('one.txt', $list[0]['name']);
+         $this->assertEquals(4, $list[0]['size']);