lintian: r837 - in trunk: checks debian
Author: rra
Date: 2007-03-18 22:13:33 +0100 (Sun, 18 Mar 2007)
New Revision: 837
Modified:
trunk/checks/menu-format
trunk/checks/menu-format.desc
trunk/debian/changelog
Log:
* checks/menu-format{.desc,}:
+ [RA] If a menu icon isn't an absolute path, only look for it in
/usr/share/pixmaps, not in the old X11R6 paths. Update the long tag
description accordingly.
Modified: trunk/checks/menu-format
===================================================================
--- trunk/checks/menu-format 2007-03-17 07:38:35 UTC (rev 836)
+++ trunk/checks/menu-format 2007-03-18 21:13:33 UTC (rev 837)
@@ -447,21 +447,15 @@
tag "menu-item-uses-icon-none", "$fullname:$linecount";
return;
}
-
+
if (not ($icon =~ m/\.xpm$/i)) {
tag "menu-icon-not-in-xpm-format", "$icon";
return;
}
- # try the explicit location, but if not, try one of the standard paths
+ # Try the explicit location, and if that fails, try the standard path.
my $iconfile = "unpacked/$icon";
if (! -f $iconfile) {
- $iconfile = "unpacked/usr/X11R6/include/X11/pixmaps/$icon";
- }
- if (! -f $iconfile) {
- $iconfile = "unpacked/usr/X11R6/include/X11/bitmaps/$icon";
- }
- if (! -f $iconfile) {
$iconfile = "unpacked/usr/share/pixmaps/$icon";
}
Modified: trunk/checks/menu-format.desc
===================================================================
--- trunk/checks/menu-format.desc 2007-03-17 07:38:35 UTC (rev 836)
+++ trunk/checks/menu-format.desc 2007-03-18 21:13:33 UTC (rev 837)
@@ -105,12 +105,14 @@
Tag: menu-icon-missing
Type: warning
-Info: This icon file couldn't be found in the standard icon locations
- within the package (<tt>/usr/X11R6/include/X11/pixmaps</tt> and
- <tt>/usr/X11R6/include/X11/bitmaps</tt>).
+Info: This icon file couldn't be found. If the path to the icon in the
+ menu file is an absolute path, make sure that icon exists at that path in
+ the package. If the path is relative or a simple filename, make sure the
+ icon is installed in <tt>/usr/share/pixmaps</tt>, the default location.
.
- If the icon is in a dependent package then this warning can be ignored,
- since currently lintian cannot check icons in other packages.
+ If the icon is in a package this package depends on, add a lintian
+ override for this warning. lintian cannot check icons in other packages.
+Ref: menu manual 3.7
Tag: menu-icon-too-big
Type: error
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-03-17 07:38:35 UTC (rev 836)
+++ trunk/debian/changelog 2007-03-18 21:13:33 UTC (rev 837)
@@ -37,6 +37,10 @@
Aoki for the suggestion. (Closes: #405840)
+ [RA] Recognize the +bX convention for binary NMUs. Warn about use
of the old three-part version numbers.
+ * checks/menu-format{.desc,}:
+ + [RA] If a menu icon isn't an absolute path, only look for it in
+ /usr/share/pixmaps, not in the old X11R6 paths. Update the long tag
+ description accordingly.
* checks/menus:
+ [JA] Perl syntax corrections. Removed extra empty newlines.
* checks/lintian.desc:
Reply to: