[SCM] Debian package checker branch, master, updated. 1.24.2-81-ge6e6c73
The following commit has been merged in the master branch:
commit e6e6c731bc1ccc010a30379da136497ff506e49b
Author: Frank Lichtenheld <djpig@debian.org>
Date: Tue Aug 5 22:59:19 2008 -0300
checks/files: Don't issue superfluous file-in-unusal-dir tags
Don't issue tag file-in-unusal-dir for files where we already
issued one of the specific dir-or-file-in-* tags.
Pointed out by Scott Kitterman.
diff --git a/checks/files b/checks/files
index fce8221..236bf7e 100644
--- a/checks/files
+++ b/checks/files
@@ -491,7 +491,9 @@ foreach my $file (sort keys %{$info->index}) {
# non-FHS, but still usual
or $file =~ m,^usr/[^/]+-linux[^/]*/,
or $file =~ m,^usr/iraf/,
- or $file =~ m,^emul/ia32-linux/(lib|usr/lib)/,) {
+ or $file =~ m,^emul/ia32-linux/(lib|usr/lib)/,
+ # not allowed, but tested indivudually
+ or $file =~ m,^(mnt|opt|srv|(var/)?tmp)/,) {
tag "file-in-unusual-dir", "$file";
}
}
diff --git a/debian/changelog b/debian/changelog
index 7346e3b..ac02082 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,8 @@ lintian (1.24.3) unstable; urgency=low
+ [ADB] Update a couple of Policy references. Thanks Jordà Polo.
+ [ADB] Warn when a package embeds a copy of the Universal Feed Parser.
Patch from Chris Lamb. (Closes: #493156)
+ + [FL] Don't issue tag file-in-unusal-dir for files where we already
+ issued one of the specific dir-or-file-in-* tags. (Closes: #493921)
* checks/huge-usr-share:
+ [ADB] Replace (the single) direct access to fields/* with ::field()
+ [ADB] Replace an outdated link to the Developer's Reference.
diff --git a/testset/filenames/debian/rules b/testset/filenames/debian/rules
index 921637d..117ba4d 100755
--- a/testset/filenames/debian/rules
+++ b/testset/filenames/debian/rules
@@ -145,6 +145,8 @@ binary-indep:
install -d debian/tmp/srv/foo
touch debian/tmp/srv/foo/bar
+ install -d debian/tmp/opt/foo
+ touch debian/tmp/opt/foo/bar
install -d debian/tmp/etc/gconf/schemas
touch debian/tmp/etc/gconf/schemas/test.schema
diff --git a/testset/tags.filenames b/testset/tags.filenames
index 892bf19..57076ba 100644
--- a/testset/tags.filenames
+++ b/testset/tags.filenames
@@ -2,6 +2,8 @@ E: filename-games: no-copyright-file
E: filename-games: package-section-games-but-contains-no-game
E: filenames: bad-menu-file-name usr/lib/menu/menu
E: filenames: bad-menu-file-name usr/share/menu/menu
+E: filenames: dir-or-file-in-opt opt/foo/
+E: filenames: dir-or-file-in-opt opt/foo/bar
E: filenames: dir-or-file-in-srv srv/foo/
E: filenames: dir-or-file-in-srv srv/foo/bar
E: filenames: dir-or-file-in-var-www var/www/foo
@@ -88,7 +90,6 @@ W: filenames: file-in-unusual-dir files/Maelstrom Sound.mine
W: filenames: file-in-unusual-dir files/feedparser.py
W: filenames: file-in-unusual-dir files/svk-commitsEr9P.tmp
W: filenames: file-in-unusual-dir files/svn-commit.tmp
-W: filenames: file-in-unusual-dir srv/foo/bar
W: filenames: file-in-usr-lib-sgml usr/lib/sgml/package
W: filenames: file-name-ends-in-whitespace files/'\\
W: filenames: macos-ds-store-file-in-package usr/share/doc/filenames/.DS_Store
--
Debian package checker
Reply to: