diff -Nru php-console-table-1.3.1/debian/changelog php-console-table-1.3.1/debian/changelog --- php-console-table-1.3.1/debian/changelog 2021-10-27 18:03:55.000000000 +0000 +++ php-console-table-1.3.1/debian/changelog 2021-11-25 16:14:56.000000000 +0000 @@ -1,14 +1,23 @@ -php-console-table (1.3.1-0.1ubuntu2) jammy; urgency=medium +php-console-table (1.3.1-1) unstable; urgency=medium - * No change rebuild for PHP 8.1 + * Team upload + * Add d/gbp.conf + * PHP 8 compat + * Trim trailing whitespace. + * Use secure copyright file specification URI. + * Update watch file format version to 4. + * Use secure URI in Homepage field. + * Bump debhelper from deprecated 9 to 13. + * Set debhelper-compat version in Build-Depends. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, Repository-Browse. + * Update Vcs-* headers to use salsa repository. + * Remove unnecessary get-orig-source-target. + * Set Rules-Requires-Root: no. + * Remove self from uploaders + * Install dh-sequence-* instead of using dh --with + * Update Standards-Version to 4.6.0 - -- Bryce Harrington Wed, 27 Oct 2021 18:03:55 +0000 - -php-console-table (1.3.1-0.1ubuntu1) impish; urgency=medium - - * d/p/fromarray-is-static.patch: Fix FTBFS with php8 - - -- Bryce Harrington Tue, 15 Jun 2021 19:49:32 +0000 + -- David Prévot Thu, 25 Nov 2021 12:14:56 -0400 php-console-table (1.3.1-0.1) unstable; urgency=medium @@ -105,4 +114,3 @@ * Initial Release (Closes: #650831). -- Antoine Beaupré Sat, 03 Dec 2011 12:50:03 -0500 - diff -Nru php-console-table-1.3.1/debian/compat php-console-table-1.3.1/debian/compat --- php-console-table-1.3.1/debian/compat 2014-03-18 12:00:48.000000000 +0000 +++ php-console-table-1.3.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru php-console-table-1.3.1/debian/control php-console-table-1.3.1/debian/control --- php-console-table-1.3.1/debian/control 2021-06-15 19:49:32.000000000 +0000 +++ php-console-table-1.3.1/debian/control 2021-11-25 16:13:46.000000000 +0000 @@ -1,15 +1,14 @@ Source: php-console-table Section: php Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian PHP PEAR Maintainers -Uploaders: Antoine Beaupré , - David Prévot -Build-Depends: debhelper (>= 9), php-mbstring, pkg-php-tools -Standards-Version: 3.9.7 -Homepage: http://pear.php.net/package/Console_Table -Vcs-Git: git://anonscm.debian.org/pkg-php/php-console-table.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-console-table.git +Maintainer: Debian PHP PEAR Maintainers +Uploaders: Antoine Beaupré +Build-Depends: debhelper-compat (= 13), dh-sequence-phppear, php-mbstring +Standards-Version: 4.6.0 +Homepage: https://pear.php.net/package/Console_Table +Vcs-Git: https://salsa.debian.org/php-team/pear/php-console-table.git +Vcs-Browser: https://salsa.debian.org/php-team/pear/php-console-table +Rules-Requires-Root: no Package: php-console-table Architecture: all diff -Nru php-console-table-1.3.1/debian/copyright php-console-table-1.3.1/debian/copyright --- php-console-table-1.3.1/debian/copyright 2014-03-18 12:00:48.000000000 +0000 +++ php-console-table-1.3.1/debian/copyright 2021-11-25 16:09:33.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: Console_Table Source: https://github.com/pear/Console_Table Upstream-Contact: Jan Schneider diff -Nru php-console-table-1.3.1/debian/gbp.conf php-console-table-1.3.1/debian/gbp.conf --- php-console-table-1.3.1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ php-console-table-1.3.1/debian/gbp.conf 2021-11-25 16:02:44.000000000 +0000 @@ -0,0 +1,5 @@ +[DEFAULT] +debian-branch = debian/latest +pristine-tar = True +upstream-branch = upstream/latest +upstream-vcs-tag = v%(version%~%-)s diff -Nru php-console-table-1.3.1/debian/patches/0001-fromArray-is-static.patch php-console-table-1.3.1/debian/patches/0001-fromArray-is-static.patch --- php-console-table-1.3.1/debian/patches/0001-fromArray-is-static.patch 1970-01-01 00:00:00.000000000 +0000 +++ php-console-table-1.3.1/debian/patches/0001-fromArray-is-static.patch 2021-11-25 16:08:36.000000000 +0000 @@ -0,0 +1,23 @@ +From: Remi Collet +Date: Thu, 1 Apr 2021 10:37:33 +0200 +Subject: fromArray is static + +Origin: other, https://github.com/pear/Console_Table/pull/15/commits/4eea320592cc1766b8f679df22c3431a93a74d7e +Bug: https://github.com/pear/Console_Table/pull/15 +--- + Console_Table-1.3.1/Table.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Console_Table-1.3.1/Table.php b/Console_Table-1.3.1/Table.php +index dbfec73..139433b 100755 +--- a/Console_Table-1.3.1/Table.php ++++ b/Console_Table-1.3.1/Table.php +@@ -223,7 +223,7 @@ class Console_Table + * @return Console_Table|string A Console_Table object or the generated + * table. + */ +- function fromArray($headers, $data, $returnObject = false) ++ static function fromArray($headers, $data, $returnObject = false) + { + if (!is_array($headers) || !is_array($data)) { + return false; diff -Nru php-console-table-1.3.1/debian/patches/fromarray-is-static.patch php-console-table-1.3.1/debian/patches/fromarray-is-static.patch --- php-console-table-1.3.1/debian/patches/fromarray-is-static.patch 2021-06-15 19:48:30.000000000 +0000 +++ php-console-table-1.3.1/debian/patches/fromarray-is-static.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From 4eea320592cc1766b8f679df22c3431a93a74d7e Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 1 Apr 2021 10:37:33 +0200 -Subject: [PATCH] fromArray is static - ---- - Table.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Console_Table-1.3.1/Table.php b/Console_Table-1.3.1/Table.php -index dbfec73..139433b 100755 ---- a/Console_Table-1.3.1/Table.php -+++ b/Console_Table-1.3.1/Table.php -@@ -223,7 +223,7 @@ function __construct($align = CONSOLE_TABLE_ALIGN_LEFT, - * @return Console_Table|string A Console_Table object or the generated - * table. - */ -- function fromArray($headers, $data, $returnObject = false) -+ static function fromArray($headers, $data, $returnObject = false) - { - if (!is_array($headers) || !is_array($data)) { - return false; diff -Nru php-console-table-1.3.1/debian/patches/series php-console-table-1.3.1/debian/patches/series --- php-console-table-1.3.1/debian/patches/series 2021-06-15 19:45:57.000000000 +0000 +++ php-console-table-1.3.1/debian/patches/series 2021-11-25 16:08:36.000000000 +0000 @@ -1 +1 @@ -fromarray-is-static.patch +0001-fromArray-is-static.patch diff -Nru php-console-table-1.3.1/debian/rules php-console-table-1.3.1/debian/rules --- php-console-table-1.3.1/debian/rules 2014-10-29 15:17:16.000000000 +0000 +++ php-console-table-1.3.1/debian/rules 2021-11-25 16:12:58.000000000 +0000 @@ -1,13 +1,6 @@ #!/usr/bin/make -f %: - dh $@ --buildsystem=phppear --with phppear + dh $@ --buildsystem=phppear override_dh_auto_test: -ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) pear run-tests Console_Table-*/tests -else - @echo "** tests disabled" -endif - -get-orig-source: - uscan --force --verbose --rename diff -Nru php-console-table-1.3.1/debian/tests/control php-console-table-1.3.1/debian/tests/control --- php-console-table-1.3.1/debian/tests/control 2016-03-09 18:33:58.000000000 +0000 +++ php-console-table-1.3.1/debian/tests/control 2021-11-25 16:13:12.000000000 +0000 @@ -1,3 +1,3 @@ Tests: pear Restrictions: rw-build-tree -Depends: @, php-mbstring, php-pear +Depends: php-mbstring, php-pear, @ diff -Nru php-console-table-1.3.1/debian/upstream/metadata php-console-table-1.3.1/debian/upstream/metadata --- php-console-table-1.3.1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ php-console-table-1.3.1/debian/upstream/metadata 2021-11-25 16:09:27.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/pear/Console_Table/issues +Bug-Submit: https://github.com/pear/Console_Table/issues/new +Repository: https://github.com/pear/Console_Table.git +Repository-Browse: https://github.com/pear/Console_Table diff -Nru php-console-table-1.3.1/debian/watch php-console-table-1.3.1/debian/watch --- php-console-table-1.3.1/debian/watch 2014-03-18 12:00:48.000000000 +0000 +++ php-console-table-1.3.1/debian/watch 2021-11-25 16:09:15.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 +version=4 http://pear.php.net/package/Console_Table/download http://download.pear.php.net/package/Console_Table-([\d.]+)\.tgz