lintian: r407 - in trunk: checks debian

[jeroen@debian.org]

Author: jeroen
Date: 2005-01-14 22:42:06 +0100 (Fri, 14 Jan 2005)
New Revision: 407

Modified:
   trunk/checks/files
   trunk/checks/files.desc
   trunk/debian/changelog
Log:
[JvW] Only check for desktop files in GNOME's and KDE's obsolete places,
not in all the package, as KDE uses .desktop files also for other
purposes (Closes: #289773)


Modified: trunk/checks/files
===================================================================
--- trunk/checks/files	2005-01-14 21:11:13 UTC (rev 406)
+++ trunk/checks/files	2005-01-14 21:42:06 UTC (rev 407)
@@ -325,9 +325,8 @@
 	#
 	# Other applications also use .desktop files (yay!), so we need to
 	# exclude them.
-	elsif ($file =~ m,\.desktop$, && $file !~ m,^usr/share/applications/, &&
-	       $file !~ m,^usr/share/xsessions/,) {
-	    tag "desktop-file-in-wrong-dir", "$file";
+	elsif ($file =~ m,/usr/share/(?:gnome/apps|applink)/[^/]+\.desktop$,) {
+	    tag "desktop-file-in-wrong-dir", $file;
 	}
 	
     }

Modified: trunk/checks/files.desc
===================================================================
--- trunk/checks/files.desc	2005-01-14 21:11:13 UTC (rev 406)
+++ trunk/checks/files.desc	2005-01-14 21:42:06 UTC (rev 407)
@@ -490,7 +490,8 @@
 
 Tag: desktop-file-in-wrong-dir
 Type: warning
-Info: package contains a .desktop file in a non-standard directory.
+Info: package contains a .desktop file in an obsolete directory.
  According to the menu-spec draft on freedesktop.org, those .desktop
  files that are intended to create a menu should be placed in 
- <tt>/usr/share/applications/</tt>.
+ <tt>/usr/share/applications/</tt>, and no longer in
+ <tt>/usr/share/gnome/apps</tt> or <tt>/usr/share/applnk</tt>

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-01-14 21:11:13 UTC (rev 406)
+++ trunk/debian/changelog	2005-01-14 21:42:06 UTC (rev 407)
@@ -11,6 +11,9 @@
   * checks/files{,.desc}:
     [JvW] Warn only for hardlinks in /etc or amongst different directories
     (Closes: #288634)
+    [JvW] Only check for desktop files in GNOME's and KDE's obsolete places,
+    not in all the package, as KDE uses .desktop files also for other
+    purposes (Closes: #289773)
   * checks/description:
     [SRL] Do not generate warnings when a short description starts with
     an article; this is good grammar and should not be discouraged.