[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-31-gfa3fee0
The following commit has been merged in the master branch:
commit fa3fee04a11ddb90fcbaf33daff59c9c494eaa7d
Author: Niels Thykier <niels@thykier.net>
Date: Sat Mar 26 19:11:24 2011 +0100
Fixed exception regexes in c/menus for "doc-base html" files
These exception regexes never matched anything because the value
they matched against included a "$pkg/"-prefix that was not
accounted for.
diff --git a/checks/menus b/checks/menus
index 205ccae..4f789c2 100644
--- a/checks/menus
+++ b/checks/menus
@@ -146,10 +146,10 @@ for my $file (@{$info->sorted_index}) {
unless $menumethod_includes_menu_h or $pkg eq 'menu';
}
# package doc dir?
- elsif ($file =~ m,^usr/share/doc/(.+\.(?:html|pdf))(?:\.gz)?$,
- and $file !~ /examples/) {
+ elsif ($file =~ m,^usr/share/doc/(?:[^/]+/)?(.+\.(?:html|pdf))(?:\.gz)?$,o) {
my $name = $1;
- unless ($name =~ /^changelog\.html$/ or $name =~ /^README[.-]/) {
+ unless ($name =~ m/^changelog\.html$/o or $name =~ m/^README[.-]/o
+ or $name =~ m|examples|o) {
$documentation = 1;
}
}
diff --git a/debian/changelog b/debian/changelog
index aa32857..81505ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,10 @@ lintian (2.5.0~rc2) UNRELEASED; urgency=low
+ [NT] Fixed an inconsistency in output of file names. Thanks to
أحمد المحمودي (Ahmed El-Mahmoudy) for the report.
(Closes: #618921)
+ * checks/menus:
+ + [NT] Fixed check for special files that does not need to be
+ registered with doc-base (e.g. README.html). Thanks to
+ Tanguy Ortolo for the report. (Closes: #617266)
* data/changelog-file/ubuntu-dists:
+ [NT] Added oneiric as valid Ubuntu distribution. Thanks to Benjamin
--
Debian package checker
Reply to: