Axel Beckert pushed to branch master at lintian / lintian
Commits:
1a794ba7 by Axel Beckert at 2023-01-28T23:18:17+01:00
Add testsuite check for missing-pkg-php-tools-addon false positive with
dh-sequence-phpcomposer (see MR !438)
- - - - -
472de40c by William Desportes at 2023-01-28T23:23:58+01:00
missing-pkg-php-tools-addon: Allow dh-sequence-phpcomposer as alternative to
pkg-php-tools-addon
(perltidy variant of MR !438)
- - - - -
7 changed files:
- lib/Lintian/Check/Languages/Php/Pear.pm
- +
t/recipes/checks/languages/php/pear/phppear-composerok/build-spec/debian/control.in
- +
t/recipes/checks/languages/php/pear/phppear-composerok/build-spec/fill-values
- +
t/recipes/checks/languages/php/pear/phppear-composerok/build-spec/orig/composer.json
- +
t/recipes/checks/languages/php/pear/phppear-composerok/build-spec/orig/foo.php
- + t/recipes/checks/languages/php/pear/phppear-composerok/eval/desc
- + t/recipes/checks/languages/php/pear/phppear-composerok/eval/hints
Changes:
=====================================
lib/Lintian/Check/Languages/Php/Pear.pm
=====================================
@@ -149,7 +149,8 @@ sub source {
$self->pointed_hint('composer-package-without-pkg-php-tools-builddep',
$composer_json->pointer)
if defined $composer_json
- && !$build_depends->satisfies('pkg-php-tools')
+ && !($build_depends->satisfies('pkg-php-tools')
+ || $build_depends->satisfies('dh-sequence-phpcomposer'))
&& !defined $package_xml
&& !defined $package2_xml;
=====================================
t/recipes/checks/languages/php/pear/phppear-composerok/build-spec/debian/control.in
=====================================
@@ -0,0 +1,20 @@
+Source: [% $source %]
+Priority: optional
+Section: [% $section %]
+Maintainer: [% $author %]
+Standards-Version: [% $standards_version %]
+Build-Depends: [% $build_depends %], dh-sequence-phpcomposer, php-dev, dh-php
+Rules-Requires-Root: no
+
+Package: [% $source %]
+Architecture: [% $package_architecture %]
+Depends: ${misc:Depends}, ${phppear:Debian-Depends}
+Recommends: ${phppear:Debian-Recommends}
+Breaks: ${phppear:Debian-Breaks}
+Description: ${phppear:summary}
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package. It may
+ be an empty package.
+ .
+ ${phppear:description}
=====================================
t/recipes/checks/languages/php/pear/phppear-composerok/build-spec/fill-values
=====================================
@@ -0,0 +1,3 @@
+Testname: phppear-composerok
+Description: Composer phppear tests with dh-sequence-phpcomposer
+Skeleton: upload-non-native
=====================================
t/recipes/checks/languages/php/pear/phppear-composerok/build-spec/orig/composer.json
=====================================
@@ -0,0 +1 @@
+{}
=====================================
t/recipes/checks/languages/php/pear/phppear-composerok/build-spec/orig/foo.php
=====================================
=====================================
t/recipes/checks/languages/php/pear/phppear-composerok/eval/desc
=====================================
@@ -0,0 +1,4 @@
+Testname: phppear-composerok
+Test-Against:
+ missing-pkg-php-tools-addon
+Check: languages/php/pear
=====================================
t/recipes/checks/languages/php/pear/phppear-composerok/eval/hints
=====================================
View it on GitLab:
https://salsa.debian.org/lintian/lintian/-/compare/5400667211bf4af86265d579cfe743c7a43cc992...472de40cabc960117f18ca0cb7562840ed36fe18
--
View it on GitLab:
https://salsa.debian.org/lintian/lintian/-/compare/5400667211bf4af86265d579cfe743c7a43cc992...472de40cabc960117f18ca0cb7562840ed36fe18
You're receiving this email because of your account on salsa.debian.org.
