diff -Nru php-horde-turba-4.2.21/debian/changelog php-horde-turba-4.2.21/debian/changelog
--- php-horde-turba-4.2.21/debian/changelog	2017-09-27 19:58:34.000000000 +0000
+++ php-horde-turba-4.2.21/debian/changelog	2018-02-20 22:53:45.000000000 +0000
@@ -1,3 +1,10 @@
+php-horde-turba (4.2.21-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
+    classes and getMock -> createMock.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 20 Feb 2018 14:53:45 -0800
+
 php-horde-turba (4.2.21-1) unstable; urgency=medium
 
   * New upstream version 4.2.21
diff -Nru php-horde-turba-4.2.21/debian/control php-horde-turba-4.2.21/debian/control
--- php-horde-turba-4.2.21/debian/control	2017-09-27 19:58:34.000000000 +0000
+++ php-horde-turba-4.2.21/debian/control	2018-02-20 22:53:45.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-turba
 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, php-horde-role
 Standards-Version: 3.9.8
diff -Nru php-horde-turba-4.2.21/debian/patches/phpunit6_compat.patch php-horde-turba-4.2.21/debian/patches/phpunit6_compat.patch
--- php-horde-turba-4.2.21/debian/patches/phpunit6_compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ php-horde-turba-4.2.21/debian/patches/phpunit6_compat.patch	2018-02-20 22:53:45.000000000 +0000
@@ -0,0 +1,38 @@
+Description: PHPUnit 6 has namespaced classes and getMock -> createMock
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-20
+
+--- a/turba-4.2.21/test/Turba/TestCase.php
++++ b/turba-4.2.21/test/Turba/TestCase.php
+@@ -29,7 +29,7 @@
+  * @link       http://www.horde.org/apps/turba
+  * @license    http://www.horde.org/licenses/apache Apache-like
+  */
+-class Turba_TestCase extends PHPUnit_Framework_TestCase
++class Turba_TestCase extends PHPUnit\Framework\TestCase
+ {
+     protected function getInjector()
+     {
+--- a/turba-4.2.21/test/Turba/ToDo/TestBase.php
++++ b/turba-4.2.21/test/Turba/ToDo/TestBase.php
+@@ -6,7 +6,7 @@
+  * @package Turba
+  * @subpackage UnitTests
+  */
+-class Turba_TestBase extends PHPUnit_Framework_TestCase {
++class Turba_TestBase extends PHPUnit\Framework\TestCase {
+ 
+     var $_driver;
+     var $_driverConfig = array(
+--- a/turba-4.2.21/test/Turba/Unit/Driver/Base.php
++++ b/turba-4.2.21/test/Turba/Unit/Driver/Base.php
+@@ -113,7 +113,7 @@
+         if (!class_exists('Horde_ActiveSync')){
+             $this->markTestSkipped('ActiveSync not installed.');
+         }
+-        $state = $this->getMock('Horde_ActiveSync_State_Base', array(), array(), '', false);
++        $state = $this->createMock('Horde_ActiveSync_State_Base', array(), array(), '', false);
+         $fixture = array(
+             'userAgent' => 'Apple-iPad3C6/1202.435',
+             'properties' => array(Horde_ActiveSync_Device::OS => 'iOS 8.1.1')
diff -Nru php-horde-turba-4.2.21/debian/patches/series php-horde-turba-4.2.21/debian/patches/series
--- php-horde-turba-4.2.21/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ php-horde-turba-4.2.21/debian/patches/series	2018-02-20 22:53:05.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compat.patch