[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.4.svn151842-2-1-gfda19a8

[Jo Shields]

The following commit has been merged in the master branch:
commit fda19a81bf26653c4f71faaf172e6f45512c8917
Author: Jo Shields <directhex at apebox.org>
Date:   Wed May 26 11:10:52 2010 +0100

    patch from laney to fix dashisms in update-monodoc

diff --git a/debian/changelog b/debian/changelog
index 7d80d21..09ed869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mono (2.4.4~svn151842-3) UNRELEASED; urgency=low
+
+  * debian/update-monodoc: Fix syntax error that occurs when sh is bash but
+    not dash. Prevented the generation of the monodoc search indexes using
+    the trigger.
+
+ -- Iain Lane <laney at ubuntu.com>  Wed, 26 May 2010 10:44:55 +0100
+
 mono (2.4.4~svn151842-2) unstable; urgency=low
 
   [ Mirco Bauer ]
diff --git a/debian/update-monodoc b/debian/update-monodoc
index beb30c2..324bf19 100755
--- a/debian/update-monodoc
+++ b/debian/update-monodoc
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
-if [ ! -x /usr/lib/monodoc/browser.exe -o ! $(dpkg-query -W -f=\'${Status}\' monodoc-browser 2>/dev/null | grep "ok installed") ]; then
-	# nothing to do
+
+if [ ! -x /usr/lib/monodoc/browser.exe -o -z "$(dpkg-query -W -f='${Status}' monodoc-browser 2>/dev/null | grep "ok installed")" ]; then
 	exit 0
 fi
 

-- 
mono