diff -Nru php-finder-facade-1.2.2/debian/changelog php-finder-facade-1.2.2/debian/changelog --- php-finder-facade-1.2.2/debian/changelog 2017-11-27 23:52:23.000000000 +0000 +++ php-finder-facade-1.2.2/debian/changelog 2019-08-10 01:43:36.000000000 +0000 @@ -1,3 +1,20 @@ +php-finder-facade (1.2.2-3) unstable; urgency=medium + + * d/control: + - Move repository to salsa + - Update Standards-Version to 4.4.0 + - Bump debhelper from old 9 to 12. + - Marck php-finder-facade-doc as Multi-Arch: foreign + - Use fonts-liberation instead of embedded font + * d/rules: + - Drop get-orig-source target + - Use debian/clean for directories + * d/copyright: Use versioned copyright format URI. + * d/u/metadata: Set upstream metadata fields: Contact, Name. + * Compatibility with recent PHPUnit (8) + + -- David Prévot Fri, 09 Aug 2019 15:43:36 -1000 + php-finder-facade (1.2.2-2) unstable; urgency=medium * Move to namespaced phpunit versions (Closes: #882900) diff -Nru php-finder-facade-1.2.2/debian/clean php-finder-facade-1.2.2/debian/clean --- php-finder-facade-1.2.2/debian/clean 2017-11-27 23:49:14.000000000 +0000 +++ php-finder-facade-1.2.2/debian/clean 2019-08-10 01:31:28.000000000 +0000 @@ -1 +1,4 @@ +.phpunit.result.cache +debian/api/ +debian/phpdox/ src/autoload.php diff -Nru php-finder-facade-1.2.2/debian/compat php-finder-facade-1.2.2/debian/compat --- php-finder-facade-1.2.2/debian/compat 2017-11-27 23:49:14.000000000 +0000 +++ php-finder-facade-1.2.2/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru php-finder-facade-1.2.2/debian/control php-finder-facade-1.2.2/debian/control --- php-finder-facade-1.2.2/debian/control 2017-11-27 23:49:14.000000000 +0000 +++ php-finder-facade-1.2.2/debian/control 2019-08-10 01:43:36.000000000 +0000 @@ -5,17 +5,17 @@ Uploaders: David Prévot , Prach Pongpanich Build-Depends: ant, - debhelper (>= 9), + debhelper-compat (= 12), php-fdomdocument, php-symfony-finder, phpab, phpdox, phpunit, pkg-php-tools (>= 1.7~) -Standards-Version: 4.1.1 +Standards-Version: 4.4.0 Homepage: https://github.com/sebastianbergmann/finder-facade -Vcs-Git: git://anonscm.debian.org/pkg-php/php-finder-facade.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-finder-facade.git +Vcs-Git: https://salsa.debian.org/php-team/pear/php-finder-facade.git +Vcs-Browser: https://salsa.debian.org/php-team/pear/php-finder-facade Package: php-finder-facade Architecture: all @@ -34,7 +34,8 @@ Package: php-finder-facade-doc Section: doc Architecture: all -Depends: ${misc:Depends} +Multi-Arch: foreign +Depends: fonts-liberation, ${misc:Depends} Description: convenience wrapper for Symfony's Finder component - documentation This package contains the documentation for FinderFacade. . diff -Nru php-finder-facade-1.2.2/debian/copyright php-finder-facade-1.2.2/debian/copyright --- php-finder-facade-1.2.2/debian/copyright 2017-11-27 23:49:14.000000000 +0000 +++ php-finder-facade-1.2.2/debian/copyright 2019-08-10 01:24:41.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: FinderFacade Upstream-Contact: Sebastian Bergmann Source: https://github.com/sebastianbergmann/finder-facade diff -Nru php-finder-facade-1.2.2/debian/patches/0001-Move-to-namespaced-phpunit-versions.patch php-finder-facade-1.2.2/debian/patches/0001-Move-to-namespaced-phpunit-versions.patch --- php-finder-facade-1.2.2/debian/patches/0001-Move-to-namespaced-phpunit-versions.patch 2017-11-27 23:50:33.000000000 +0000 +++ php-finder-facade-1.2.2/debian/patches/0001-Move-to-namespaced-phpunit-versions.patch 2019-08-10 01:24:41.000000000 +0000 @@ -4,6 +4,7 @@ Bug-Debian: https://bugs.debian.org/882900 Forwarded: https://github.com/sebastianbergmann/finder-facade/pull/11 +Applied-Upstream: https://github.com/sebastianbergmann/finder-facade/commit/b73fcdcf349c6245c59a8165704c71ed1794dc96 --- tests/ConfigurationTest.php | 4 +++- tests/FinderFacadeTest.php | 4 +++- diff -Nru php-finder-facade-1.2.2/debian/patches/0002-Compatibility-with-recent-PHPUnit-8.patch php-finder-facade-1.2.2/debian/patches/0002-Compatibility-with-recent-PHPUnit-8.patch --- php-finder-facade-1.2.2/debian/patches/0002-Compatibility-with-recent-PHPUnit-8.patch 1970-01-01 00:00:00.000000000 +0000 +++ php-finder-facade-1.2.2/debian/patches/0002-Compatibility-with-recent-PHPUnit-8.patch 2019-08-10 01:24:41.000000000 +0000 @@ -0,0 +1,35 @@ +From: =?utf-8?q?David_Pr=C3=A9vot?= +Date: Fri, 9 Aug 2019 15:24:28 -1000 +Subject: Compatibility with recent PHPUnit (8) + +--- + tests/ConfigurationTest.php | 2 +- + tests/FinderFacadeTest.php | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/ConfigurationTest.php b/tests/ConfigurationTest.php +index 4ee91d8..9b04a21 100644 +--- a/tests/ConfigurationTest.php ++++ b/tests/ConfigurationTest.php +@@ -16,7 +16,7 @@ class ConfigurationTest extends TestCase + { + protected $fixtureDir; + +- protected function setUp() ++ protected function setUp(): void + { + $this->fixtureDir = __DIR__ . DIRECTORY_SEPARATOR . 'fixture' . DIRECTORY_SEPARATOR; + } +diff --git a/tests/FinderFacadeTest.php b/tests/FinderFacadeTest.php +index bdf7a2d..42fab15 100644 +--- a/tests/FinderFacadeTest.php ++++ b/tests/FinderFacadeTest.php +@@ -16,7 +16,7 @@ class FinderFacadeTest extends TestCase + { + protected $fixtureDir; + +- protected function setUp() ++ protected function setUp(): void + { + $this->fixtureDir = __DIR__ . DIRECTORY_SEPARATOR . 'fixture' . DIRECTORY_SEPARATOR; + } diff -Nru php-finder-facade-1.2.2/debian/patches/series php-finder-facade-1.2.2/debian/patches/series --- php-finder-facade-1.2.2/debian/patches/series 2017-11-27 23:50:33.000000000 +0000 +++ php-finder-facade-1.2.2/debian/patches/series 2019-08-10 01:24:41.000000000 +0000 @@ -1 +1,2 @@ 0001-Move-to-namespaced-phpunit-versions.patch +0002-Compatibility-with-recent-PHPUnit-8.patch diff -Nru php-finder-facade-1.2.2/debian/php-finder-facade-doc.links php-finder-facade-1.2.2/debian/php-finder-facade-doc.links --- php-finder-facade-1.2.2/debian/php-finder-facade-doc.links 1970-01-01 00:00:00.000000000 +0000 +++ php-finder-facade-1.2.2/debian/php-finder-facade-doc.links 2019-08-10 01:43:36.000000000 +0000 @@ -0,0 +1 @@ +usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf usr/share/doc/php-finder-facade/api/css/SourceSansPro-Regular.ttf diff -Nru php-finder-facade-1.2.2/debian/rules php-finder-facade-1.2.2/debian/rules --- php-finder-facade-1.2.2/debian/rules 2017-11-27 23:49:14.000000000 +0000 +++ php-finder-facade-1.2.2/debian/rules 2019-08-10 01:33:29.000000000 +0000 @@ -9,20 +9,12 @@ src cd debian && phpdox -override_dh_auto_clean: - dh_auto_clean - rm -rf debian/api \ - debian/phpdox - override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - phpunit --bootstrap src/autoload.php tests + phpunit --cache-result-file=.phpunit.result.cache --bootstrap src/autoload.php tests else @echo "** tests disabled" endif override_dh_compress: dh_compress -X.xhtml - -get-orig-source: - uscan --force --verbose --rename diff -Nru php-finder-facade-1.2.2/debian/tests/control php-finder-facade-1.2.2/debian/tests/control --- php-finder-facade-1.2.2/debian/tests/control 2017-11-27 23:49:14.000000000 +0000 +++ php-finder-facade-1.2.2/debian/tests/control 2019-08-10 01:36:35.000000000 +0000 @@ -1,2 +1,2 @@ -Test-Command: phpunit --bootstrap /usr/share/php/SebastianBergmann/FinderFacade/autoload.php tests -Depends: @, phpunit +Test-Command: phpunit --cache-result-file=.phpunit.result.cache --bootstrap /usr/share/php/SebastianBergmann/FinderFacade/autoload.php tests +Depends: phpunit, @ diff -Nru php-finder-facade-1.2.2/debian/upstream/metadata php-finder-facade-1.2.2/debian/upstream/metadata --- php-finder-facade-1.2.2/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ php-finder-facade-1.2.2/debian/upstream/metadata 2019-08-10 01:24:41.000000000 +0000 @@ -0,0 +1,2 @@ +Name: FinderFacade +Contact: Sebastian Bergmann