lintian: r1111 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2008-01-05 01:56:30 +0100 (Sat, 05 Jan 2008)
New Revision: 1111

Modified:
   trunk/checks/menu-format
   trunk/debian/changelog
Log:
  + [RA] Only check for desktop files in /usr/share/applications.  The
    ones elsewhere are too strange.  (Closes: #459252)

Modified: trunk/checks/menu-format
===================================================================
--- trunk/checks/menu-format	2008-01-04 23:55:19 UTC (rev 1110)
+++ trunk/checks/menu-format	2008-01-05 00:56:30 UTC (rev 1111)
@@ -407,11 +407,11 @@
     my $operm = perm2oct($perm);
     $file_index{$file} = 1;
 
-    if ($perm =~ m,^-,o && $file =~ m/\.desktop$/o) {
+    if ($perm =~ m,^-, && $file =~ m,/usr/share/applications/.*\.desktop$,) {
         if ($perm =~ m,x,o) {
             tag "executable-desktop-file", sprintf("$file %04o",$operm);
         }
-        unless (m,template, or m,^usr/share/doc/,) {
+        unless (m,template,) {
             push (@desktop_files, $file);
         }
     }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-01-04 23:55:19 UTC (rev 1110)
+++ trunk/debian/changelog	2008-01-05 00:56:30 UTC (rev 1111)
@@ -54,6 +54,8 @@
       clearer.  Thanks, Martín Ferrari.  (Closes: #457527)
     + [RA] Warn about use of su wrappers other than su-to-root for desktop
       and Live CD support.  Thanks, Daniel Baumann.  (Closes: #453931)
+    + [RA] Only check for desktop files in /usr/share/applications.  The
+      ones elsewhere are too strange.  (Closes: #459252)
   * checks/menus{.desc,}:
     + [RA] Spelling errors in doc-base files should only be warnings.  Do
       picky spelling and capitalization checks on the abstract and title