dh_desktop: Avoid using find -execdir as it will fail with certian badly configured...

diff --git a/debian/changelog b/debian/changelog
index bd0779763faeef76a6e099c2e5e0c447ece9f6b1..2ad788b6db236883ad0055b21f72548a4f42d0d3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (7.2.8) UNRELEASED; urgency=low
+
+  * dh_desktop: Avoid using find -execdir as it will fail
+    with certian badly configured PATHs (and is not a benefit
+    in this context anyway). Closes: #521960
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 31 Mar 2009 14:07:13 -0400
+
 debhelper (7.2.7) unstable; urgency=low
 
   * Fix calling the same helper for separate packages in the override of dh

diff --git a/dh_desktop b/dh_desktop
index 1b32fc99718cae3e9636010a3b73e0fd5b5f3faa..7900152353ce22658c73e7e2ae85006f5da5a370 100755 (executable)
--- a/dh_desktop
+++ b/dh_desktop
@@ -36,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 -execdir grep -q "^MimeType" '{}' \\; -printf '%p\n'`;
+               my $desktop_files = `find $tmp/usr/share/applications -type f -name \\*.desktop -exec grep -q "^MimeType" '{}' \\; -printf '%p\n'`;
                if ($desktop_files && ! $dh{NOSCRIPTS}) {
                        autoscript($package,"postinst","postinst-desktop");
                        autoscript($package,"postrm","postrm-desktop");