[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.14-24-g5dcfcca



The following commit has been merged in the master branch:
commit e6a2ed0ac5ded7f82e6846a0319f42e00dfcbacb
Author: Russ Allbery <rra@debian.org>
Date:   Sat Sep 12 20:50:00 2009 -0700

    Only warn about non-game-specific files in /usr/share/games
    
    Rather than warning about all the directories and the files, only
    warn about files installed under /usr/share/games when they belong
    directly under /usr/share.  The warnings about the directories will
    just be noise unless the directories are empty, and if they're
    empty we will issue a separate tag for that.

diff --git a/checks/files b/checks/files
index e5d2815..46f8221 100644
--- a/checks/files
+++ b/checks/files
@@ -495,7 +495,8 @@ foreach my $file (sort keys %{$info->index}) {
 		unless ($dsize eq $fsize);
 	}
 	# ---------------- non-games-specific data in games subdirectory
-	elsif ($file =~ m,^usr/share/games/(?:applications|mime|icons|pixmaps)/,) {
+	elsif ($file =~ m,^usr/share/games/(?:applications|mime|icons|pixmaps)/,
+	       and $index_info->{type} !~ m/^d/) {
 	    tag "global-data-in-games-directory", $file;
 	}
     }
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index ce1b027..e43ee8a 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -1,9 +1,6 @@
 E: files-general: dir-or-file-in-var-lock var/lock/lintian/
 E: files-general: dir-or-file-in-var-run var/run/lintian/
 E: files-general: executable-manpage usr/share/man/man5/foo.5.gz
-E: files-general: global-data-in-games-directory usr/share/games/icons/
-E: files-general: global-data-in-games-directory usr/share/games/icons/hicolor/
-E: files-general: global-data-in-games-directory usr/share/games/icons/hicolor/22x22/
 E: files-general: global-data-in-games-directory usr/share/games/icons/hicolor/22x22/lintian-22x22.png
 E: files-general: non-conf-file-in-modprobe.d etc/modprobe.d/--lzma
 E: files-general: package-contains-info-dir-file usr/share/info/dir.gz

-- 
Debian package checker


Reply to: