[SCM] Debian package checker branch, master, updated. 2.5.6-106-g648b9a4
The following commit has been merged in the master branch:
commit 18626550b133ac6ececec816e1697fc7ce7048c7
Author: Felix Geyer <debfx-pkg@fobos.de>
Date: Mon Apr 16 18:24:30 2012 +0200
c/files: Extend icon-size-and-directory-name-mismatch check
Extend icon-size-and-directory-name-mismatch to cover all icons directories.
Useful directories include:
/usr/share/icons
/usr/share/kde4/apps/amarok/icons
diff --git a/checks/files b/checks/files
index 27a4105..d5fdb8e 100644
--- a/checks/files
+++ b/checks/files
@@ -603,14 +603,6 @@ foreach my $file (@{$info->sorted_index}) {
tag 'desktop-file-in-wrong-dir', $file;
}
- # ---------------- png files under /usr/share/apps/*/icons/*
- elsif ($file =~ m,^usr/share/apps/[^/]+/icons/[^/]+/(\d+x\d+)/.*\.png$,) {
- my ($dsize, $fsize) = ($1);
- $info->file_info->{$file} =~ m/,\s*(\d+)\s*x\s*(\d+)\s*,/;
- $fsize = $1.'x'.$2;
- tag 'icon-size-and-directory-name-mismatch', $file, $fsize
- unless ($dsize eq $fsize);
- }
# ---------------- non-games-specific data in games subdirectory
elsif ($file =~ m,^usr/share/games/(?:applications|mime|icons|pixmaps)/,
and $index_info->{type} !~ m/^d/) {
@@ -927,6 +919,14 @@ foreach my $file (@{$info->sorted_index}) {
tag 'python-module-in-wrong-location', @correction if (@correction);
}
+ if ($file =~ m,/icons/[^/]+/(\d+x\d+)/.*\.png$,) {
+ my ($dsize, $fsize) = ($1);
+ $info->file_info->{$file} =~ m/,\s*(\d+)\s*x\s*(\d+)\s*,/;
+ $fsize = $1.'x'.$2;
+ tag 'icon-size-and-directory-name-mismatch', $file, $fsize
+ unless ($dsize eq $fsize);
+ }
+
# ---------------- plain files
if ($index_info->{type} =~ m/^[-h]/) {
# ---------------- backup files and autosave files
diff --git a/t/tests/files-general/debian/debian/install b/t/tests/files-general/debian/debian/install
index 98c7ba8..74606e9 100644
--- a/t/tests/files-general/debian/debian/install
+++ b/t/tests/files-general/debian/debian/install
@@ -1,4 +1,5 @@
lintian-16x16.png usr/share/apps/lintian/icons/hicolor/22x22
+lintian-16x16.png usr/share/icons/hicolor/22x22/apps
lintian-22x22.png usr/share/apps/lintian/icons/hicolor/22x22
lintian-16x16.png usr/share/doc/lintian/
lintian-22x22.png usr/share/games/icons/hicolor/22x22
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index d2d029c..b22e693 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -19,5 +19,6 @@ W: files-general: executable-not-elf-or-script usr/share/man/man5/foo.5.gz
W: files-general: file-in-unusual-dir new-top-level-dir/file-in-new-top-level-dir
W: files-general: file-name-ends-in-whitespace usr/share/foo/ws
W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/22x22/lintian-16x16.png 16x16
+W: files-general: icon-size-and-directory-name-mismatch usr/share/icons/hicolor/22x22/apps/lintian-16x16.png 16x16
W: files-general: obsolete-comments-style-in-php-ini etc/php5/conf.d/php-foo.ini
W: files-general: windows-devel-file-in-package usr/lib/foo/foo.vcproj
--
Debian package checker
Reply to: