[lintian] 01/01: Remove additional X11R6 support/references
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit d8c3501203b6ff38f6fc744bc335317dd8c5df01
Author: Niels Thykier <niels@thykier.net>
Date: Fri Oct 6 19:13:12 2017 +0000
Remove additional X11R6 support/references
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/binaries.pm | 2 +-
checks/manpages.pm | 5 ++---
checks/menu-format.pm | 2 +-
debian/changelog | 10 +++++-----
t/tests/legacy-filenames/tags | 1 -
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/checks/binaries.pm b/checks/binaries.pm
index 3b12b5f..20b340d 100644
--- a/checks/binaries.pm
+++ b/checks/binaries.pm
@@ -219,7 +219,7 @@ sub run {
}
# For the package naming check, filter out SONAMEs where all the
- # files are at paths other than /lib, /usr/lib, or /usr/X11R6/lib.
+ # files are at paths other than /lib, /usr/lib and /usr/lib/<MA-DIR>.
# This avoids false positives with plugins like Apache modules,
# which may have their own SONAMEs but which don't matter for the
# purposes of this check. Also filter out nsswitch modules
diff --git a/checks/manpages.pm b/checks/manpages.pm
index 5795d6e..dade000 100644
--- a/checks/manpages.pm
+++ b/checks/manpages.pm
@@ -57,8 +57,7 @@ sub run {
or ($path eq 'usr/bin/X11/')
or ($path eq 'usr/bin/mh/')
or ($path eq 'usr/sbin/')
- or ($path eq 'usr/games/')
- or ($path eq 'usr/X11R6/bin/'))
+ or ($path eq 'usr/games/'))
) {
my $bin = $fname;
@@ -68,7 +67,7 @@ sub run {
next;
}
- if (($path =~ m,usr/(share|X11R6)/man/$,) and ($fname ne '')) {
+ if (($path =~ m,usr/share/man/$,) and ($fname ne '')) {
tag 'manpage-in-wrong-directory', $file;
next;
}
diff --git a/checks/menu-format.pm b/checks/menu-format.pm
index 5c88af3..00b2654 100644
--- a/checks/menu-format.pm
+++ b/checks/menu-format.pm
@@ -145,7 +145,7 @@ my %reserved_categories = map { $_ => 1 } qw(
# Path in which to search for binaries referenced in menu entries. These must
# not have leading slashes.
-my @path = qw(usr/local/bin/ usr/bin/ bin/ usr/X11R6/bin/ usr/games/);
+my @path = qw(usr/local/bin/ usr/bin/ bin/ usr/games/);
my %known_tags_hash = map { $_ => 1 } @known_tags;
my %needs_tag_vals_hash = map { $_ => 1 } @needs_tag_vals;
diff --git a/debian/changelog b/debian/changelog
index 5c70bde..53bef31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,11 @@ lintian (2.5.55) UNRELEASED; urgency=medium
it can find. (Closes: #877766)
* checks/files.pm:
+ [CL] Ignore privacy breach violations in comments. (Closes: #877421)
- * checks/{files,manpages}.{desc,pm}:
- + [NT] Stop treating usr/man and usr/X11R6/man as manpage directories
- to simplify some code paths. Nothing ships manpages in these
- directories and lintian emits tags to strongly discourage people
- from doing so.
+ * checks/{files,manpages,menu-format}.{desc,pm}:
+ + [NT] Stop considering usr/man, usr/X11R6/bin and usr/X11R6/man as
+ manpage directories / PATH directories to simplify some code paths.
+ Nothing ships manpages in these directories and lintian emits tags
+ to strongly discourage people from doing so.
* checks/init.d.pm:
+ [CL] Avoid warning for init.d-script-not-marked-as-conffile when
the init.d script does not exist; we will already be alerted via
diff --git a/t/tests/legacy-filenames/tags b/t/tests/legacy-filenames/tags
index 242f73d..cf03f75 100644
--- a/t/tests/legacy-filenames/tags
+++ b/t/tests/legacy-filenames/tags
@@ -65,7 +65,6 @@ W: filenames source: diff-contains-svn-conflict-file data/Maelstrom Sounce.r121
W: filenames source: diff-contains-svn-control-dir .svn
W: filenames source: no-section-field-for-source
W: filenames: bad-permissions-for-ali-file usr/lib/ada/adalib/test.ali
-W: filenames: binary-without-manpage usr/X11R6/bin/testxbin2
W: filenames: binary-without-manpage usr/bin/X11/testxbin
W: filenames: binary-without-manpage usr/bin/mh/read
W: filenames: debian-news-file-not-compressed usr/share/doc/filenames/NEWS.Debian
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: