diff -Nru php-sabre-dav-2.1-2.1.10/debian/changelog php-sabre-dav-2.1-2.1.10/debian/changelog --- php-sabre-dav-2.1-2.1.10/debian/changelog 2016-03-11 09:47:28.000000000 -0800 +++ php-sabre-dav-2.1-2.1.10/debian/changelog 2016-03-15 11:08:38.000000000 -0700 @@ -1,3 +1,14 @@ +php-sabre-dav-2.1 (2.1.10-1ubuntu1) xenial; urgency=medium + + * Merge with Debian unstable (LP: #1557599). Remaining changes: + - Add php-mbstring as a test dependency. + * Drop: + - Add php-mbstring as a build dependency. + - Update to PHP7.0 build and test dependencies. + [ Present in Debian ] + + -- Nishanth Aravamudan Tue, 15 Mar 2016 11:07:05 -0700 + php-sabre-dav-2.1 (2.1.10-1) unstable; urgency=medium [ Evert Pot ] @@ -23,6 +34,13 @@ -- David Prévot Wed, 02 Mar 2016 10:07:28 -0400 +php-sabre-dav-2.1 (2.1.9-1ubuntu1) xenial; urgency=medium + + * Update to PHP7.0 build and test dependencies. + * Add php-mbstring as a build & test dependency. + + -- Nishanth Aravamudan Tue, 15 Mar 2016 08:36:27 -0700 + php-sabre-dav-2.1 (2.1.9-1) unstable; urgency=medium [ Thomas Müller ] diff -Nru php-sabre-dav-2.1-2.1.10/debian/control php-sabre-dav-2.1-2.1.10/debian/control --- php-sabre-dav-2.1-2.1.10/debian/control 2016-03-11 09:43:42.000000000 -0800 +++ php-sabre-dav-2.1-2.1.10/debian/control 2016-03-15 11:10:39.000000000 -0700 @@ -1,7 +1,8 @@ Source: php-sabre-dav-2.1 Section: php Priority: optional -Maintainer: Debian PHP PEAR Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian PHP PEAR Maintainers Uploaders: David Prévot Build-Depends: debhelper (>= 8.0.0), help2man, diff -Nru php-sabre-dav-2.1-2.1.10/debian/tests/control php-sabre-dav-2.1-2.1.10/debian/tests/control --- php-sabre-dav-2.1-2.1.10/debian/tests/control 2016-03-11 09:43:42.000000000 -0800 +++ php-sabre-dav-2.1-2.1.10/debian/tests/control 2016-03-15 11:05:09.000000000 -0700 @@ -3,4 +3,4 @@ Test-Command: mkdir --parents vendor && phpab --output vendor/autoload.php --basedir vendor --template debian/autoload.tests.php.tpl tests/Sabre && phpunit --configuration tests/phpunit.xml Restrictions: rw-build-tree -Depends: @, php-curl, php-sqlite3, phpab, phpunit +Depends: @, php-curl, php-mbstring, php-sqlite3, phpab, phpunit