From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 31 Mar 2009 18:09:08 +0000 (-0400)
Subject: dh_desktop: Avoid using find -execdir as it will fail with certian badly configured... 
X-Git-Tag: 7.2.8~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f2c0117a7d1585401dea0cad7a23b59c3b311681;p=debhelper.git

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
---

diff --git a/debian/changelog b/debian/changelog
index bd07797..2ad788b 100644
--- 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 1b32fc9..7900152 100755
--- 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");