Louis-Philippe Véronneau pushed to branch master at lintian / lintian
Commits:
bb227120 by William Desportes at 2025-08-26T02:32:04+00:00
Fix override_dh_auto_test-does-not-check-DEB_BUILD_OPTIONS with
debhelper-compat (>= 13)
Closes: #950455, #1111506
- - - - -
9 changed files:
- lib/Lintian/Check/Debian/Rules.pm
- +
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options-dh-12/build-spec/debian/control.in
-
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options/build-spec/debian/rules
→
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options-dh-12/build-spec/debian/rules
- +
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options-dh-12/build-spec/fill-values
- +
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options-dh-12/eval/desc
- +
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options-dh-12/eval/hints
- −
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options/build-spec/fill-values
- −
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options/eval/desc
- −
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options/eval/hints
Changes:
=====================================
lib/Lintian/Check/Debian/Rules.pm
=====================================
@@ -617,7 +617,8 @@ sub source {
}
}
- if (my $memorized_position = $overridden{'dh_auto_test'}) {
+ if (my $memorized_position = $overridden{'dh_auto_test'}
+ and ! $build_regular->satisfies('debhelper-compat (>= 13)')) {
my @rules = grep {
!m{^\t\s*[\:\[]}
=====================================
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options-dh-12/build-spec/debian/control.in
=====================================
@@ -0,0 +1,19 @@
+Source: [% $source %]
+Priority: optional
+Section: [% $section %]
+Maintainer: [% $author %]
+Standards-Version: [% $standards_version %]
+Build-Depends: [% $build_depends %], phpab, phpunit, pkg-php-tools
+Rules-Requires-Root: no
+Homepage: https://lintian.debian.org/
+
+Package: [% $source %]
+Architecture: [% $package_architecture %]
+Depends: ${misc:Depends}, ${phpcomposer:Debian-require}
+Recommends: ${phpcomposer:Debian-recommend}
+Suggests: ${phpcomposer:Debian-suggest}
+Description: [% $description %]
+ 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.
=====================================
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options/build-spec/debian/rules
→
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options-dh-12/build-spec/debian/rules
=====================================
=====================================
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options-dh-12/build-spec/fill-values
=====================================
@@ -0,0 +1,4 @@
+Skeleton: upload-native
+Testname: rules-dh-auto-test-does-not-check-deb-build-options-dh-12
+Description: Test for missing checks for DEB_BUILD_PROFILES using DH12
+Dh-Compat-Level: 12
=====================================
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options-dh-12/eval/desc
=====================================
@@ -0,0 +1,2 @@
+Testname: rules-dh-auto-test-does-not-check-deb-build-options-dh-12
+Check: debian/rules
=====================================
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options-dh-12/eval/hints
=====================================
@@ -0,0 +1 @@
+rules-dh-auto-test-does-not-check-deb-build-options-dh-12 (source):
override_dh_auto_test-does-not-check-DEB_BUILD_OPTIONS [debian/rules:6]
=====================================
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options/build-spec/fill-values
deleted
=====================================
@@ -1,3 +0,0 @@
-Skeleton: upload-native
-Testname: rules-dh-auto-test-does-not-check-deb-build-options
-Description: Test for missing checks for DEB_BUILD_PROFILES
=====================================
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options/eval/desc
deleted
=====================================
@@ -1,2 +0,0 @@
-Testname: rules-dh-auto-test-does-not-check-deb-build-options
-Check: debian/rules
=====================================
t/recipes/checks/debian/rules/rules-dh-auto-test-does-not-check-deb-build-options/eval/hints
deleted
=====================================
@@ -1 +0,0 @@
-rules-dh-auto-test-does-not-check-deb-build-options (source):
override_dh_auto_test-does-not-check-DEB_BUILD_OPTIONS [debian/rules:6]
View it on GitLab:
https://salsa.debian.org/lintian/lintian/-/commit/bb2271209b5cf39a542a8cb3b26cd8ac8a2d08c6
--
View it on GitLab:
https://salsa.debian.org/lintian/lintian/-/commit/bb2271209b5cf39a542a8cb3b26cd8ac8a2d08c6
You're receiving this email because of your account on salsa.debian.org.
