diff -Nru php-horde-turba-4.2.12/debian/changelog php-horde-turba-4.2.12/debian/changelog --- php-horde-turba-4.2.12/debian/changelog 2016-02-06 13:30:59.000000000 -0800 +++ php-horde-turba-4.2.12/debian/changelog 2016-03-25 08:36:09.000000000 -0700 @@ -1,3 +1,11 @@ +php-horde-turba (4.2.12-1ubuntu1) xenial; urgency=medium + + * Update to PHP7.0 dependencies (LP: #1544352). + * debian/patches/Fix-instantiation-of-ActiveSync-object.patch: Fix + instantiation of ActiveSync object in Turba test. + + -- Nishanth Aravamudan Thu, 24 Mar 2016 16:21:44 -0700 + php-horde-turba (4.2.12-1) unstable; urgency=medium * New upstream version 4.2.12 diff -Nru php-horde-turba-4.2.12/debian/control php-horde-turba-4.2.12/debian/control --- php-horde-turba-4.2.12/debian/control 2016-02-06 13:30:59.000000000 -0800 +++ php-horde-turba-4.2.12/debian/control 2016-03-24 16:21:55.000000000 -0700 @@ -1,7 +1,8 @@ Source: php-horde-turba Section: php Priority: extra -Maintainer: Horde Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Horde Maintainers Uploaders: Mathieu Parent Build-Depends: debhelper (>= 9), pkg-php-tools, pear-horde-channel, php-horde-role Standards-Version: 3.9.6 diff -Nru php-horde-turba-4.2.12/debian/patches/Fix-instantiation-of-ActiveSync-object.patch php-horde-turba-4.2.12/debian/patches/Fix-instantiation-of-ActiveSync-object.patch --- php-horde-turba-4.2.12/debian/patches/Fix-instantiation-of-ActiveSync-object.patch 1969-12-31 16:00:00.000000000 -0800 +++ php-horde-turba-4.2.12/debian/patches/Fix-instantiation-of-ActiveSync-object.patch 2016-03-25 08:39:27.000000000 -0700 @@ -0,0 +1,27 @@ +Description: Fix instantiation of ActiveSync object in Turba test. +Author: Nishanth Aravamudan +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1544352 +Origin: upstream, https://github.com/horde/horde/commit/5600091fc93c48065521caf86019545a1fef105b + +Index: gitwd/turba-4.2.12/test/Turba/Unit/Driver/Base.php +=================================================================== +--- gitwd.orig/turba-4.2.12/test/Turba/Unit/Driver/Base.php ++++ gitwd/turba-4.2.12/test/Turba/Unit/Driver/Base.php +@@ -110,7 +110,16 @@ class Turba_Unit_Driver_Base extends Tur + + public function testDuplicateDetectionFromAsWithNoEmail() + { +- $eas_obj = Horde_ActiveSync::messageFactory('Contact'); ++ if (!class_exists('Horde_ActiveSync')){ ++ $this->markTestSkipped('ActiveSync not installed.'); ++ } ++ $state = $this->getMock('Horde_ActiveSync_State_Base', array(), array(), '', false); ++ $fixture = array( ++ 'userAgent' => 'Apple-iPad3C6/1202.435', ++ 'properties' => array('Horde_ActiveSync_Device::OS' => 'iOS 8.1.1') ++ ); ++ $device = new Horde_ActiveSync_Device($state, $fixture); ++ $eas_obj = new Horde_ActiveSync_Message_Contact(array('device' => $device, 'protocolversion' => Horde_ActiveSync::VERSION_FOURTEEN)); + $eas_obj->firstname = 'Firstname'; + $eas_obj->fileas = 'Firstname'; + $eas_obj->homephonenumber = '+55555555'; diff -Nru php-horde-turba-4.2.12/debian/patches/series php-horde-turba-4.2.12/debian/patches/series --- php-horde-turba-4.2.12/debian/patches/series 1969-12-31 16:00:00.000000000 -0800 +++ php-horde-turba-4.2.12/debian/patches/series 2016-03-25 08:32:25.000000000 -0700 @@ -0,0 +1 @@ +Fix-instantiation-of-ActiveSync-object.patch diff -Nru php-horde-turba-4.2.12/debian/tests/control php-horde-turba-4.2.12/debian/tests/control --- php-horde-turba-4.2.12/debian/tests/control 2016-02-06 13:30:59.000000000 -0800 +++ php-horde-turba-4.2.12/debian/tests/control 2016-03-24 16:21:36.000000000 -0700 @@ -1,3 +1,3 @@ Tests: phpunit Restrictions: needs-recommends -Depends: @, php5-cli, php-horde-test, php5-sqlite +Depends: @, php-cli, php-horde-test, php-sqlite3