diff -Nru php-text-captcha-1.0.2/debian/changelog php-text-captcha-1.0.2/debian/changelog --- php-text-captcha-1.0.2/debian/changelog 2020-03-27 07:18:59.000000000 +0000 +++ php-text-captcha-1.0.2/debian/changelog 2020-12-14 19:47:43.000000000 +0000 @@ -1,3 +1,16 @@ +php-text-captcha (1.0.2-8) unstable; urgency=medium + + * Team upload + + [ Debian Janitor ] + * Use secure URI in Homepage field. + + [ David Prévot ] + * Handle patches with gbp pq + * Adapt to recent version of PHPUnit (9) + + -- David Prévot Mon, 14 Dec 2020 15:47:43 -0400 + php-text-captcha (1.0.2-7) unstable; urgency=medium * Removing 'Words' driver as it depends on php-numbers-words, which will diff -Nru php-text-captcha-1.0.2/debian/control php-text-captcha-1.0.2/debian/control --- php-text-captcha-1.0.2/debian/control 2020-03-27 07:14:20.000000000 +0000 +++ php-text-captcha-1.0.2/debian/control 2020-12-14 19:47:43.000000000 +0000 @@ -13,7 +13,7 @@ pkg-php-tools Vcs-Browser: https://salsa.debian.org/php-team/pear/php-text-captcha Vcs-Git: https://salsa.debian.org/php-team/pear/php-text-captcha.git -Homepage: http://pear.php.net/package/Text_CAPTCHA +Homepage: https://pear.php.net/package/Text_CAPTCHA Standards-Version: 4.5.0 Rules-Requires-Root: no diff -Nru php-text-captcha-1.0.2/debian/patches/0003-Adapt-to-recent-version-of-PHPUnit-9.patch php-text-captcha-1.0.2/debian/patches/0003-Adapt-to-recent-version-of-PHPUnit-9.patch --- php-text-captcha-1.0.2/debian/patches/0003-Adapt-to-recent-version-of-PHPUnit-9.patch 1970-01-01 00:00:00.000000000 +0000 +++ php-text-captcha-1.0.2/debian/patches/0003-Adapt-to-recent-version-of-PHPUnit-9.patch 2020-12-14 19:47:43.000000000 +0000 @@ -0,0 +1,34 @@ +From: =?utf-8?q?David_Pr=C3=A9vot?= +Date: Sun, 13 Dec 2020 15:08:36 -0400 +Subject: Adapt to recent version of PHPUnit (9) + +--- + Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Figlet_Test.php | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Figlet_Test.php b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Figlet_Test.php +index c60c6e2..b705e59 100644 +--- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Figlet_Test.php ++++ b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Figlet_Test.php +@@ -204,7 +204,7 @@ class Text_CAPTCHA_Driver_Figlet_Test extends PHPUnit\Framework\TestCase + $this->_captcha->init($options); + $captcha = $this->_captcha->getCAPTCHA(); + $this->assertNotNull($captcha); +- $this->assertContains('width:123px;', $captcha); ++ $this->assertStringContainsString('width:123px;', $captcha); + $this->assertNotNull($this->_captcha->getPhrase()); + } + +@@ -227,9 +227,9 @@ class Text_CAPTCHA_Driver_Figlet_Test extends PHPUnit\Framework\TestCase + $this->_captcha->init($options); + $captcha = $this->_captcha->getCAPTCHA(); + $this->assertNotNull($captcha); +- $this->assertContains('border: 1px dashed red;', $captcha); +- $this->assertContains('color: yellow;', $captcha); +- $this->assertContains('background: black;', $captcha); ++ $this->assertStringContainsString('border: 1px dashed red;', $captcha); ++ $this->assertStringContainsString('color: yellow;', $captcha); ++ $this->assertStringContainsString('background: black;', $captcha); + $this->assertNotNull($this->_captcha->getPhrase()); + } + } diff -Nru php-text-captcha-1.0.2/debian/patches/php-text-captcha_phpunit6.diff php-text-captcha-1.0.2/debian/patches/php-text-captcha_phpunit6.diff --- php-text-captcha-1.0.2/debian/patches/php-text-captcha_phpunit6.diff 2020-02-16 07:28:20.000000000 +0000 +++ php-text-captcha-1.0.2/debian/patches/php-text-captcha_phpunit6.diff 2020-12-14 19:47:43.000000000 +0000 @@ -1,8 +1,21 @@ -Description: Makes php-text-captcha build with phpunit 7.0.3 (and later). -Author: Karsten Koop +From: Karsten Koop +Date: Sun, 13 Dec 2020 14:57:10 -0400 +Subject: Makes php-text-captcha build with phpunit 7.0.3 (and later). + +--- + Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php | 6 +++--- + Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Figlet_Test.php | 6 +++--- + Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Image_Test.php | 10 +++++----- + Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Numeral_Test.php | 4 ++-- + Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Word_Test.php | 4 ++-- + Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Test.php | 10 +++++----- + 6 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php +index 25a3266..e652fb9 100644 --- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php +++ b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php -@@ -20,7 +20,7 @@ +@@ -20,7 +20,7 @@ require_once 'Text/CAPTCHA.php'; * @license BSD License * @link http://pear.php.net/package/Text_CAPTCHA */ @@ -11,7 +24,7 @@ { /** * Test instance -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ class Text_CAPTCHA_Driver_Equation_Test extends PHPUnit_Framework_TestCase * * @return void */ @@ -20,7 +33,7 @@ { $this->_captcha = Text_CAPTCHA::factory("Equation"); } -@@ -74,7 +74,7 @@ +@@ -74,7 +74,7 @@ class Text_CAPTCHA_Driver_Equation_Test extends PHPUnit_Framework_TestCase */ public function testInvalidComplexity() { @@ -29,9 +42,11 @@ $this->_captcha->init( array( 'severity' => 99 +diff --git a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Figlet_Test.php b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Figlet_Test.php +index 4792f19..c60c6e2 100644 --- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Figlet_Test.php +++ b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Figlet_Test.php -@@ -20,7 +20,7 @@ +@@ -20,7 +20,7 @@ require_once 'Text/CAPTCHA.php'; * @license BSD License * @link http://pear.php.net/package/Text_CAPTCHA */ @@ -40,7 +55,7 @@ { /** * Test instance -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ class Text_CAPTCHA_Driver_Figlet_Test extends PHPUnit_Framework_TestCase * * @return void */ @@ -49,7 +64,7 @@ { $this->_captcha = Text_CAPTCHA::factory("Figlet"); } -@@ -157,7 +157,7 @@ +@@ -157,7 +157,7 @@ class Text_CAPTCHA_Driver_Figlet_Test extends PHPUnit_Framework_TestCase */ public function testInvalidOutputType() { @@ -58,9 +73,11 @@ $options = array( 'font_file' => glob(dirname(__FILE__) . '/data/*.flf'), 'output' => 'image' +diff --git a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Image_Test.php b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Image_Test.php +index 0d94f4e..9936f86 100644 --- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Image_Test.php +++ b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Image_Test.php -@@ -20,7 +20,7 @@ +@@ -20,7 +20,7 @@ require_once 'Text/CAPTCHA.php'; * @license BSD License * @link http://pear.php.net/package/Text_CAPTCHA */ @@ -69,7 +86,7 @@ { /** * Test instance -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ class Text_CAPTCHA_Driver_Image_Test extends PHPUnit_Framework_TestCase * * @return void */ @@ -78,7 +95,7 @@ { $this->_captcha = Text_CAPTCHA::factory("Image"); } -@@ -89,7 +89,7 @@ +@@ -89,7 +89,7 @@ class Text_CAPTCHA_Driver_Image_Test extends PHPUnit_Framework_TestCase */ public function testTooLong2() { @@ -87,7 +104,7 @@ $imageOptions = array( 'font_path' => dirname(__FILE__) . '/data/', 'font_file' => 'cour.ttf', -@@ -112,7 +112,7 @@ +@@ -112,7 +112,7 @@ class Text_CAPTCHA_Driver_Image_Test extends PHPUnit_Framework_TestCase */ public function testTooHeight() { @@ -96,7 +113,7 @@ $imageOptions = array( 'font_path' => dirname(__FILE__) . '/data/', 'font_file' => 'cour.ttf', -@@ -168,7 +168,7 @@ +@@ -168,7 +168,7 @@ class Text_CAPTCHA_Driver_Image_Test extends PHPUnit_Framework_TestCase */ public function testInvalidOutput() { @@ -105,9 +122,11 @@ $imageOptions = array( 'font_path' => dirname(__FILE__) . '/data/', 'font_file' => 'cour.ttf', +diff --git a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Numeral_Test.php b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Numeral_Test.php +index bb8a9aa..146af08 100644 --- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Numeral_Test.php +++ b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Numeral_Test.php -@@ -20,7 +20,7 @@ +@@ -20,7 +20,7 @@ require_once 'Text/CAPTCHA.php'; * @license BSD License * @link http://pear.php.net/package/Text_CAPTCHA */ @@ -116,7 +135,7 @@ { /** * Test instance -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ class Text_CAPTCHA_Driver_Numeral_Test extends PHPUnit_Framework_TestCase * * @return void */ @@ -125,9 +144,11 @@ { $this->_captcha = Text_CAPTCHA::factory("Numeral"); } +diff --git a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Word_Test.php b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Word_Test.php +index 1473271..8217baf 100644 --- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Word_Test.php +++ b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Word_Test.php -@@ -20,7 +20,7 @@ +@@ -20,7 +20,7 @@ require_once 'Text/CAPTCHA.php'; * @license BSD License * @link http://pear.php.net/package/Text_CAPTCHA */ @@ -136,7 +157,7 @@ { /** * Test instance -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ class Text_CAPTCHA_Driver_Word_Test extends PHPUnit_Framework_TestCase * * @return void */ @@ -145,9 +166,11 @@ { $this->_captcha = Text_CAPTCHA::factory("Word"); } +diff --git a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Test.php b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Test.php +index 8c6809a..a35071c 100644 --- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Test.php +++ b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Test.php -@@ -20,7 +20,7 @@ +@@ -20,7 +20,7 @@ require_once 'Text/CAPTCHA.php'; * @license BSD License * @link http://pear.php.net/package/Text_CAPTCHA */ @@ -156,7 +179,7 @@ { /** * test invalid driver name. -@@ -29,7 +29,7 @@ +@@ -29,7 +29,7 @@ class Text_CAPTCHA_Test extends PHPUnit_Framework_TestCase */ public function testInvalidDriverName() { @@ -165,7 +188,7 @@ Text_CAPTCHA::factory('invalidDriver'); } -@@ -40,7 +40,7 @@ +@@ -40,7 +40,7 @@ class Text_CAPTCHA_Test extends PHPUnit_Framework_TestCase */ public function testNoDriverName() { @@ -174,7 +197,7 @@ Text_CAPTCHA::factory(''); } -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ class Text_CAPTCHA_Test extends PHPUnit_Framework_TestCase */ public function testInit() { @@ -183,7 +206,7 @@ $captcha = Text_CAPTCHA::factory('Word'); $captcha->generate(); } -@@ -82,7 +82,7 @@ +@@ -82,7 +82,7 @@ class Text_CAPTCHA_Test extends PHPUnit_Framework_TestCase */ public function testNullDriver() { diff -Nru php-text-captcha-1.0.2/debian/patches/remove-Numbers_Words.patch php-text-captcha-1.0.2/debian/patches/remove-Numbers_Words.patch --- php-text-captcha-1.0.2/debian/patches/remove-Numbers_Words.patch 2020-03-27 07:18:59.000000000 +0000 +++ php-text-captcha-1.0.2/debian/patches/remove-Numbers_Words.patch 2020-12-14 19:47:43.000000000 +0000 @@ -1,5 +1,20 @@ -Description: Removing 'Word' driver as it depends on php-numbers-words. -Author: Andrius Merkys +From: Andrius Merkys +Date: Sun, 13 Dec 2020 14:57:11 -0400 +Subject: Removing 'Word' driver as it depends on php-numbers-words. + +--- + Text_CAPTCHA-1.0.2/Text/CAPTCHA/Driver/Word.php | 127 --------------------- + .../tests/Text_CAPTCHA_Driver_Equation_Test.php | 20 ---- + .../tests/Text_CAPTCHA_Driver_Word_Test.php | 83 -------------- + Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Test.php | 19 --- + package.xml | 2 - + 5 files changed, 251 deletions(-) + delete mode 100644 Text_CAPTCHA-1.0.2/Text/CAPTCHA/Driver/Word.php + delete mode 100644 Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Word_Test.php + +diff --git a/Text_CAPTCHA-1.0.2/Text/CAPTCHA/Driver/Word.php b/Text_CAPTCHA-1.0.2/Text/CAPTCHA/Driver/Word.php +deleted file mode 100644 +index b7bdce7..0000000 --- a/Text_CAPTCHA-1.0.2/Text/CAPTCHA/Driver/Word.php +++ /dev/null @@ -1,127 +0,0 @@ @@ -131,6 +146,38 @@ - } -} \ No newline at end of file +diff --git a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php +index e652fb9..286288a 100644 +--- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php ++++ b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php +@@ -81,24 +81,4 @@ class Text_CAPTCHA_Driver_Equation_Test extends PHPUnit\Framework\TestCase + ) + ); + } +- +- /** +- * test NumbersToText +- * +- * @return void +- */ +- public function testNumbersToText() +- { +- $this->_captcha->init( +- array( +- 'min' => 1, +- 'max' => 4, +- 'locale' => 'de', +- 'numbersToText' => true, +- 'severity' => 2 +- ) +- ); +- $this->assertNotNull($this->_captcha->getCAPTCHA()); +- $this->assertNotNull($this->_captcha->getPhrase()); +- } + } +diff --git a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Word_Test.php b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Word_Test.php +deleted file mode 100644 +index 8217baf..0000000 --- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Word_Test.php +++ /dev/null @@ -1,83 +0,0 @@ @@ -217,12 +264,15 @@ - $this->assertNotNull($this->_captcha->getPhrase()); - } -} +diff --git a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Test.php b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Test.php +index a35071c..185c856 100644 --- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Test.php +++ b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Test.php -@@ -45,25 +45,6 @@ +@@ -44,25 +44,6 @@ class Text_CAPTCHA_Test extends PHPUnit\Framework\TestCase + Text_CAPTCHA::factory(''); } - /** +- /** - * test generate function - * - * @return void @@ -241,13 +291,14 @@ - $this->assertEquals('Testphrase', $phraseAfterSet); - } - -- /** + /** * test driver init. * - * @return void +diff --git a/package.xml b/package.xml +index 4b958d3..c6b9793 100644 --- a/package.xml +++ b/package.xml -@@ -68,7 +68,6 @@ +@@ -68,7 +68,6 @@ and humans apart) @@ -255,7 +306,7 @@ -@@ -80,7 +79,6 @@ +@@ -80,7 +79,6 @@ and humans apart) @@ -263,30 +314,3 @@ ---- a/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php -+++ b/Text_CAPTCHA-1.0.2/tests/Text_CAPTCHA_Driver_Equation_Test.php -@@ -81,24 +81,4 @@ - ) - ); - } -- -- /** -- * test NumbersToText -- * -- * @return void -- */ -- public function testNumbersToText() -- { -- $this->_captcha->init( -- array( -- 'min' => 1, -- 'max' => 4, -- 'locale' => 'de', -- 'numbersToText' => true, -- 'severity' => 2 -- ) -- ); -- $this->assertNotNull($this->_captcha->getCAPTCHA()); -- $this->assertNotNull($this->_captcha->getPhrase()); -- } - } diff -Nru php-text-captcha-1.0.2/debian/patches/series php-text-captcha-1.0.2/debian/patches/series --- php-text-captcha-1.0.2/debian/patches/series 2020-03-27 06:28:54.000000000 +0000 +++ php-text-captcha-1.0.2/debian/patches/series 2020-12-14 19:47:43.000000000 +0000 @@ -1,2 +1,3 @@ php-text-captcha_phpunit6.diff remove-Numbers_Words.patch +0003-Adapt-to-recent-version-of-PHPUnit-9.patch