This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian.
commit b880cc522da37da97f8292fccadcd96e0432f372 Author: Chris Lamb <[email protected]> Date: Mon Mar 12 10:28:33 2018 -0700 Drop apache2-module-depends-on-real-apache2-package tag as there are separate tags for missing apache2-api-* dependencies. Thanks to Thijs Kinkhorst et al. (Closes: #796285) --- checks/apache2.desc | 13 ------------- checks/apache2.pm | 8 -------- debian/changelog | 4 ++++ t/tests/apache2-modules-general/desc | 1 - t/tests/apache2-modules-general/tags | 1 - 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/checks/apache2.desc b/checks/apache2.desc index 60115dc..d476301 100644 --- a/checks/apache2.desc +++ b/checks/apache2.desc @@ -12,19 +12,6 @@ Info: The package appears to be an Apache2 HTTPD server module but it isn't <tt>libapache2-mod-name</tt> with <tt>mod-name</tt> being the actual <tt>mod_name.so</tt> equivalent. - -Tag: apache2-module-depends-on-real-apache2-package -Severity: serious -Certainty: certain -Info: The package is an Apache2 HTTPD server module but it depends on a real - Apache2 package. Binary module packages must depend on the virtual - <tt>apache2-api-YYYYMMNN</tt> package only in order to ease transitions in - future. - . - In particular, module packages must not pull the full web server or any of its - associated data packages as a dependency. That's left to the user. - - Tag: apache2-module-does-not-depend-on-apache2-api Severity: serious Certainty: certain diff --git a/checks/apache2.pm b/checks/apache2.pm index 843fbcb..b3531d0 100644 --- a/checks/apache2.pm +++ b/checks/apache2.pm @@ -132,13 +132,6 @@ sub check_module_package { my $expected_name = 'libapache2-' . lc($module); my $rel; - my $visit = sub { - if (m/^apache2(?:\.2)?-(?:common|data|bin)$/) { - tag 'apache2-module-depends-on-real-apache2-package', $_; - return 1; - } - return 0; - }; $expected_name =~ tr/_/-/; if ($expected_name ne $pkg) { @@ -146,7 +139,6 @@ sub check_module_package { $expected_name; } - $info->relation('strong')->visit($visit, VISIT_STOP_FIRST_MATCH); $rel = Lintian::Relation->and($info->relation('strong'), $info->relation('recommends')); if (!$rel->matches(qr/^apache2-api-\d+$/o)) { diff --git a/debian/changelog b/debian/changelog index 5abe532..b7791c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ lintian (2.5.80) UNRELEASED; urgency=medium XXX: generate tag summary + * checks/apache2.{desc,pm}: + + [CL] Drop apache2-module-depends-on-real-apache2-package tag as there + are separate tags for missing apache2-api-* dependencies. Thanks to + Thijs Kinkhorst et al. (Closes: #796285) * checks/fields.pm: + [CL] Only check dependency fields in binary packages for mail-transport-agent-dependency-does-not-specify-default-mta etc. diff --git a/t/tests/apache2-modules-general/desc b/t/tests/apache2-modules-general/desc index 9cc6593..eb4fefe 100644 --- a/t/tests/apache2-modules-general/desc +++ b/t/tests/apache2-modules-general/desc @@ -2,7 +2,6 @@ Testname: apache2-modules-general Version: 1.0 Description: Several tests related to Apache2 module packages Test-For: - apache2-module-depends-on-real-apache2-package apache2-module-does-not-depend-on-apache2-api non-standard-apache2-module-package-name apache2-module-does-not-ship-load-file diff --git a/t/tests/apache2-modules-general/tags b/t/tests/apache2-modules-general/tags index aa2af04..d2b3188 100644 --- a/t/tests/apache2-modules-general/tags +++ b/t/tests/apache2-modules-general/tags @@ -1,7 +1,6 @@ E: libapache2-mod-foo2: apache2-module-does-not-ship-load-file etc/apache2/mods-available/foo2.load E: libapache2-mod-foo2: apache2-reverse-dependency-ships-file-in-not-allowed-directory etc/apache2/mods-enabled/foo.conf E: libapache2-mod-foo: apache2-configuration-files-need-conf-suffix etc/apache2/mods-available/foo -E: libapache2-modbaz: apache2-module-depends-on-real-apache2-package apache2.2-common E: libapache2-modbaz: apache2-module-does-not-depend-on-apache2-api W: libapache2-mod-foo2: apache2-reverse-dependency-calls-wrapper-script postinst a2enmod W: libapache2-mod-foo2: apache2-reverse-dependency-calls-wrapper-script postrm a2dismod -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
