[lintian] 02/02: Add a moreinfo field to obsolete path and add /etc/X11/fonts/X11R7 as obsolete path
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit 6f2189117a007306d7ab554579e4d7caa0a58da8
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Sat Dec 28 14:19:33 2013 +0100
Add a moreinfo field to obsolete path and add /etc/X11/fonts/X11R7 as obsolete path
signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/files.pm | 12 ++++++++++--
data/files/obsolete-paths | 7 +++++--
debian/changelog | 4 ++++
t/tests/files-foo-in-bar/tags | 3 ++-
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/checks/files.pm b/checks/files.pm
index a057c5c..2198896 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -235,8 +235,14 @@ my $OBSOLETE_PATHS = Lintian::Data->new(
'files/obsolete-paths',
qr/\s*\->\s*/,
sub {
+ my @sliptline = split(/\s*\~\~\s*/, $_[1], 2);
+ if (scalar(@sliptline) != 2) {
+ fail 'Syntax error in files/obsolete-paths', $.;
+ }
+ my ($newdir, $moreinfo) = @sliptline;
return {
- 'newdir' => $_[1],
+ 'newdir' => $newdir,
+ 'moreinfo' => $moreinfo,
'match' => qr/$_[0]/x,
'olddir' => $_[0],
};
@@ -402,8 +408,10 @@ sub run {
= $OBSOLETE_PATHS->value($obsolete_path)->{'olddir'};
my $newpath
= $OBSOLETE_PATHS->value($obsolete_path)->{'newdir'};
+ my $moreinfo
+ = $OBSOLETE_PATHS->value($obsolete_path)->{'moreinfo'};
tag 'package-install-into-obsolete-dir',
- "$file : $oldpath -> $newpath";
+ "$file : $oldpath -> $newpath (see also $moreinfo)";
}
}
diff --git a/data/files/obsolete-paths b/data/files/obsolete-paths
index 2d0d17a..4852a48 100644
--- a/data/files/obsolete-paths
+++ b/data/files/obsolete-paths
@@ -1,2 +1,5 @@
-# obsolete path (regexp) -> newer path
-^etc/dhcp3/.+ -> etc/dhcp
\ No newline at end of file
+# obsolete path (regexp) -> newer path ~~ Reference
+#
+# Please alpha sort
+^etc/dhcp3/ -> etc/dhcp ~~ http://bugs.debian.org/673029
+^etc/X11/fonts/X11R7/ -> etc/X11/fonts ~~ http://bugs.debian.org/364530#24
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 1d3ca72..6857914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ lintian (2.5.21) UNRELEASED; urgency=medium
+ [BR] Remove long obsolete reference to rc.boot(5) manpage
in package-installs-into-etc-rc.boot description.
Thanks to Jakub Wilk (Closes: #729034).
+ + [BR] Add a moreinfo field to obsolete path.
* checks/rules.{desc,pm}:
+ [BR] Use Lintian::Data for forbidden construct in rules
@@ -35,6 +36,9 @@ lintian (2.5.21) UNRELEASED; urgency=medium
* data/cruft/non-free-files:
+ [BR] Add sRGB.icm to non free files (Closes: #699369).
+ * data/files/obsolete-paths:
+ + [BR] Add /etc/X11/fonts/X11R7 as obsolete path (Closes: #646872).
+
* data/files/privacy-breaker-website
+ [BR] Add w3c website valid x?html icons.
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index dd5ccb4..5460819 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -65,7 +65,8 @@ W: files-foo-in-bar: non-multi-arch-lib-dir usr/lib32/
W: files-foo-in-bar: non-multi-arch-lib-dir usr/lib64/
W: files-foo-in-bar: non-multi-arch-lib-dir usr/libx32/
W: files-foo-in-bar: non-standard-dir-in-usr usr/foo/
-W: files-foo-in-bar: package-install-into-obsolete-dir etc/dhcp3/bar : ^etc/dhcp3/.+ -> etc/dhcp
+W: files-foo-in-bar: package-install-into-obsolete-dir etc/dhcp3/ : ^etc/dhcp3/ -> etc/dhcp (see also http://bugs.debian.org/673029)
+W: files-foo-in-bar: package-install-into-obsolete-dir etc/dhcp3/bar : ^etc/dhcp3/ -> etc/dhcp (see also http://bugs.debian.org/673029)
W: files-foo-in-bar: package-installs-into-etc-gconf-schemas etc/gconf/schemas/bar
W: files-foo-in-bar: package-installs-nonbinary-perl-in-usr-lib-perl5 usr/lib/perl5/Foo/Bar.pm
W: files-foo-in-bar: package-installs-perllocal-pod usr/lib/perl-foo/perllocal.pod
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: