r2025: * dh_desktop: Only generate calls to update-desktop-database for desktop

  files with MimeType fields. Patch from Emmet Hikory. Closes: #427831

diff --git a/debian/changelog b/debian/changelog
index 739597c029c76d553bfcd66cf3250feebbcf2e8e..d0cc7a1168dde08eedddfd506bc062966e28611c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (5.0.55) UNRELEASED; urgency=low
+
+  * dh_desktop: Only generate calls to update-desktop-database for desktop
+    files with MimeType fields. Patch from Emmet Hikory. Closes: #427831
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 13 Sep 2007 15:11:06 -0400
+
 debhelper (5.0.54) unstable; urgency=low
 
   * dh_strip: Man page reference to policy section on DEB_BUILD_OPTIONS.

diff --git a/dh_desktop b/dh_desktop
index 4542fc56d88342224519412dc3264e360f52955f..1b32fc99718cae3e9636010a3b73e0fd5b5f3faa 100755 (executable)
--- a/dh_desktop
+++ b/dh_desktop
@@ -20,6 +20,10 @@ Currently this program does not handle installation of the files, though it
 may do so at a later date. It takes care of adding maintainer script
 fragments to call F<update-desktop-database>.
 
+Note that since F<update-desktop-database> currently only handles mime
+types, as an optimisation, desktop files not containing MimeType fields
+will currently  be ignored by dh_desktop.
+
 =cut
 
 init();
@@ -32,7 +36,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # usr/share/applications and thus might need
                # update-desktop-database be called. Other desktop
                # files don't.
-               my $desktop_files = `find $tmp/usr/share/applications -type f -name \\*.desktop -printf '%p\n'`;
+               my $desktop_files = `find $tmp/usr/share/applications -type f -name \\*.desktop -execdir grep -q "^MimeType" '{}' \\; -printf '%p\n'`;
                if ($desktop_files && ! $dh{NOSCRIPTS}) {
                        autoscript($package,"postinst","postinst-desktop");
                        autoscript($package,"postrm","postrm-desktop");