diff -Nru php-directory-scanner-1.3.2/debian/changelog php-directory-scanner-1.3.2/debian/changelog --- php-directory-scanner-1.3.2/debian/changelog 2017-08-03 15:49:39.000000000 +0000 +++ php-directory-scanner-1.3.2/debian/changelog 2017-11-30 07:08:21.000000000 +0000 @@ -1,3 +1,10 @@ +php-directory-scanner (1.3.2-2) unstable; urgency=medium + + * Move to namespaced phpunit versions (Closes: #882908) + * Update Standards-Version to 4.1.1 + + -- David Prévot Wed, 29 Nov 2017 21:08:21 -1000 + php-directory-scanner (1.3.2-1) unstable; urgency=medium * Convert packaging to Composer source diff -Nru php-directory-scanner-1.3.2/debian/control php-directory-scanner-1.3.2/debian/control --- php-directory-scanner-1.3.2/debian/control 2017-08-03 15:49:39.000000000 +0000 +++ php-directory-scanner-1.3.2/debian/control 2017-11-30 07:07:55.000000000 +0000 @@ -13,7 +13,7 @@ phpmd, phpunit, pkg-php-tools -Standards-Version: 4.0.0 +Standards-Version: 4.1.1 Homepage: https://github.com/theseer/DirectoryScanner Vcs-Git: git://anonscm.debian.org/pkg-php/php-directory-scanner.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-directory-scanner.git diff -Nru php-directory-scanner-1.3.2/debian/patches/0002-Move-to-namespaced-phpunit-versions.patch php-directory-scanner-1.3.2/debian/patches/0002-Move-to-namespaced-phpunit-versions.patch --- php-directory-scanner-1.3.2/debian/patches/0002-Move-to-namespaced-phpunit-versions.patch 1970-01-01 00:00:00.000000000 +0000 +++ php-directory-scanner-1.3.2/debian/patches/0002-Move-to-namespaced-phpunit-versions.patch 2017-11-30 07:07:07.000000000 +0000 @@ -0,0 +1,53 @@ +From: =?utf-8?q?David_Pr=C3=A9vot?= +Date: Wed, 29 Nov 2017 21:03:55 -1000 +Subject: Move to namespaced phpunit versions + +Debian-Bug: https://bugs.debian.org/882908 +Forwarded: https://github.com/theseer/DirectoryScanner/pull/8 +--- + tests/directoryscanner.test.php | 3 ++- + tests/phpfilter.test.php | 4 +++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tests/directoryscanner.test.php b/tests/directoryscanner.test.php +index 403aa06..5edca05 100644 +--- a/tests/directoryscanner.test.php ++++ b/tests/directoryscanner.test.php +@@ -37,6 +37,7 @@ + + namespace TheSeer\DirectoryScanner\Tests { + ++ use PHPUnit\Framework\TestCase; + use TheSeer\DirectoryScanner\DirectoryScanner; + + /** +@@ -45,7 +46,7 @@ namespace TheSeer\DirectoryScanner\Tests { + * @author Arne Blankerts + * @copyright Arne Blankerts , All rights reserved. + */ +- class DirectoryScannerTest extends \PHPUnit_Framework_TestCase { ++ class DirectoryScannerTest extends TestCase { + + /** + * Test if enabling following symbolic links works. +diff --git a/tests/phpfilter.test.php b/tests/phpfilter.test.php +index fc518c6..b40b5cc 100644 +--- a/tests/phpfilter.test.php ++++ b/tests/phpfilter.test.php +@@ -37,13 +37,15 @@ + + namespace TheSeer\DirectoryScanner\Tests { + ++ use PHPUnit\Framework\TestCase; ++ + /** + * Unit tests for PHPFilter iterator class + * + * @author Arne Blankerts + * @copyright Arne Blankerts , All rights reserved. + */ +- class PHPFilterIteratorTest extends \PHPUnit_Framework_TestCase { ++ class PHPFilterIteratorTest extends TestCase { + + public function testNonPHPFile() { + $list = new \ArrayIterator( diff -Nru php-directory-scanner-1.3.2/debian/patches/series php-directory-scanner-1.3.2/debian/patches/series --- php-directory-scanner-1.3.2/debian/patches/series 2017-08-03 15:49:39.000000000 +0000 +++ php-directory-scanner-1.3.2/debian/patches/series 2017-11-30 07:07:07.000000000 +0000 @@ -1 +1,2 @@ 0001-Adapt-upstream-build-system-to-Debian-expectations.patch +0002-Move-to-namespaced-phpunit-versions.patch diff -Nru php-directory-scanner-1.3.2/debian/rules php-directory-scanner-1.3.2/debian/rules --- php-directory-scanner-1.3.2/debian/rules 2017-08-03 15:49:39.000000000 +0000 +++ php-directory-scanner-1.3.2/debian/rules 2017-11-30 07:07:07.000000000 +0000 @@ -5,7 +5,6 @@ override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) ant test - phpunit --configuration phpunit.xml.dist --bootstrap src/autoload.php else @echo "** tests disabled" endif