diff -pruN 4.2.23-1/debian/changelog 4.2.23-1ubuntu2/debian/changelog --- 4.2.23-1/debian/changelog 2017-09-27 19:28:25.000000000 +0000 +++ 4.2.23-1ubuntu2/debian/changelog 2019-09-10 18:04:07.000000000 +0000 @@ -1,3 +1,20 @@ +php-horde-kronolith (4.2.23-1ubuntu2) eoan; urgency=medium + + * No-change rebuild for PHP7.3 + + -- Bryce Harrington Tue, 10 Sep 2019 18:04:07 +0000 + +php-horde-kronolith (4.2.23-1ubuntu1) bionic; urgency=medium + + * debian/patches/0001-phpunit6-compatibility.patch: switch to + namespaced PHPUnit 6+ classes. + * debian/patches/0002-fix-count-typo.patch: fix incorrect closing + parenthesis placement in count() call. + * debian/patches/0003-php72-compatibility.patch: PHP 7.2 + compatibility. (LP: #1749783) + + -- Matt Coleman Thu, 22 Feb 2018 13:34:31 -0800 + php-horde-kronolith (4.2.23-1) unstable; urgency=medium * New upstream version 4.2.23 diff -pruN 4.2.23-1/debian/control 4.2.23-1ubuntu2/debian/control --- 4.2.23-1/debian/control 2017-09-27 19:28:25.000000000 +0000 +++ 4.2.23-1ubuntu2/debian/control 2018-02-22 21:33:08.000000000 +0000 @@ -1,7 +1,8 @@ Source: php-horde-kronolith 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.8 diff -pruN 4.2.23-1/debian/patches/0001-phpunit6-compatibility.patch 4.2.23-1ubuntu2/debian/patches/0001-phpunit6-compatibility.patch --- 4.2.23-1/debian/patches/0001-phpunit6-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.2.23-1ubuntu2/debian/patches/0001-phpunit6-compatibility.patch 2018-02-22 21:33:08.000000000 +0000 @@ -0,0 +1,18 @@ +Description: switch to namespaced PHPUnit 6+ classes +Author: Matt Coleman +Origin: other +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: php-horde-kronolith-4.2.23/kronolith-4.2.23/test/Kronolith/TestCase.php +=================================================================== +--- php-horde-kronolith-4.2.23.orig/kronolith-4.2.23/test/Kronolith/TestCase.php ++++ php-horde-kronolith-4.2.23/kronolith-4.2.23/test/Kronolith/TestCase.php +@@ -28,7 +28,7 @@ + * @license http://www.horde.org/licenses/gpl GNU General Public License, version 2 + */ + class Kronolith_TestCase +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + protected function getInjector() + { diff -pruN 4.2.23-1/debian/patches/0002-fix-count-typo.patch 4.2.23-1ubuntu2/debian/patches/0002-fix-count-typo.patch --- 4.2.23-1/debian/patches/0002-fix-count-typo.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.2.23-1ubuntu2/debian/patches/0002-fix-count-typo.patch 2018-02-22 21:33:08.000000000 +0000 @@ -0,0 +1,18 @@ +Description: fix incorrect closing parenthesis placement in count() call +Author: Matt Coleman +Origin: other +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: php-horde-kronolith-4.2.23/kronolith-4.2.23/lib/Event.php +=================================================================== +--- php-horde-kronolith-4.2.23.orig/kronolith-4.2.23/lib/Event.php ++++ php-horde-kronolith-4.2.23/kronolith-4.2.23/lib/Event.php +@@ -795,7 +795,7 @@ abstract class Kronolith_Event + + // Tags + if ($this->tags) { +- if (count($this->tags == 1)) { ++ if (count($this->tags) == 1) { + $vEvent->setAttribute('CATEGORIES', $this->tags[0]); + } else { + $vEvent->setAttribute('CATEGORIES', '', array(), true, $this->tags); diff -pruN 4.2.23-1/debian/patches/0003-php72-compatibility.patch 4.2.23-1ubuntu2/debian/patches/0003-php72-compatibility.patch --- 4.2.23-1/debian/patches/0003-php72-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.2.23-1ubuntu2/debian/patches/0003-php72-compatibility.patch 2018-02-22 21:33:08.000000000 +0000 @@ -0,0 +1,80 @@ +Description: PHP 7.2 compatibility + * Don't attempt to use a nonexistent array element + * Ensure tests that modify the session are run in separate processes. +Author: Matt Coleman +Origin: other +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: php-horde-kronolith-4.2.23/kronolith-4.2.23/lib/CalendarsManager.php +=================================================================== +--- php-horde-kronolith-4.2.23.orig/kronolith-4.2.23/lib/CalendarsManager.php ++++ php-horde-kronolith-4.2.23/kronolith-4.2.23/lib/CalendarsManager.php +@@ -391,7 +391,7 @@ class Kronolith_CalendarsManager + $prefs->setValue('default_share', $share->getName()); + + // Calendar auto-sharing with the user's groups +- if ($conf['autoshare']['shareperms'] != 'none') { ++ if (isset($conf['autoshare']) && $conf['autoshare']['shareperms'] != 'none') { + $perm_value = 0; + switch ($conf['autoshare']['shareperms']) { + case 'read': +Index: php-horde-kronolith-4.2.23/kronolith-4.2.23/test/Kronolith/Integration/Driver/Sql/Pdo/SqliteTest.php +=================================================================== +--- php-horde-kronolith-4.2.23.orig/kronolith-4.2.23/test/Kronolith/Integration/Driver/Sql/Pdo/SqliteTest.php ++++ php-horde-kronolith-4.2.23/kronolith-4.2.23/test/Kronolith/Integration/Driver/Sql/Pdo/SqliteTest.php +@@ -33,6 +33,10 @@ class Kronolith_Integration_Driver_Sql_P + + static public function setUpBeforeClass() + { ++ } ++ ++ public function setUp() ++ { + self::$callback = array(__CLASS__, 'getDb'); + parent::setUpBeforeClass(); + $migrator = new Horde_Db_Migration_Migrator( +@@ -54,4 +58,20 @@ class Kronolith_Integration_Driver_Sql_P + { + self::createSqlPdoSqlite(self::$setup); + } ++ ++ /** ++ * @runInSeparateProcess ++ */ ++ public function testRecurrence() ++ { ++ parent::testRecurrence(); ++ } ++ ++ /** ++ * @runInSeparateProcess ++ */ ++ public function testRecurrenceException() ++ { ++ parent::testRecurrenceException(); ++ } + } +Index: php-horde-kronolith-4.2.23/kronolith-4.2.23/test/Kronolith/Integration/Kronolith/Sql/Pdo/SqliteTest.php +=================================================================== +--- php-horde-kronolith-4.2.23.orig/kronolith-4.2.23/test/Kronolith/Integration/Kronolith/Sql/Pdo/SqliteTest.php ++++ php-horde-kronolith-4.2.23/kronolith-4.2.23/test/Kronolith/Integration/Kronolith/Sql/Pdo/SqliteTest.php +@@ -26,6 +26,8 @@ + * @author Gunnar Wrobel + * @link http://www.horde.org/apps/kronolith + * @license http://www.horde.org/licenses/gpl GNU General Public License, version 2 ++ * ++ * @runTestsInSeparateProcesses + */ + class Kronolith_Integration_Kronolith_Sql_Pdo_SqliteTest extends Kronolith_Integration_Kronolith_Sql_Base + { +@@ -33,6 +35,10 @@ class Kronolith_Integration_Kronolith_Sq + + static public function setUpBeforeClass() + { ++ } ++ ++ public function setUp() ++ { + self::$callback = array(__CLASS__, 'getDb'); + parent::setUpBeforeClass(); + $migrator = new Horde_Db_Migration_Migrator( diff -pruN 4.2.23-1/debian/patches/series 4.2.23-1ubuntu2/debian/patches/series --- 4.2.23-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 4.2.23-1ubuntu2/debian/patches/series 2018-02-22 21:33:08.000000000 +0000 @@ -0,0 +1,3 @@ +0001-phpunit6-compatibility.patch +0002-fix-count-typo.patch +0003-php72-compatibility.patch