[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-1-16-g64f4eb9

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit 4acef36181f6ab5a241d4b1231430464f56ef9d0
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Jun 22 09:46:40 2010 +0100

    laney's dashism patch for monodoc

diff --git a/debian/changelog b/debian/changelog
index 075cefb..b570cd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ mono (2.6.3-2) UNRELEASED; urgency=low
     + Backport from upstream SVN repository to fix CVE-2010-1459, which
       implies that the default value for EnableViewStateMac can potentially
       allow XSS attacks against ASP.NET sites hosted on Mono
+  * debian/update-monodoc:
+    + Updated script from Iain Lane <laney at ubuntu.com> which no longer fails
+      when called using bash rather than dash
 
  -- Jo Shields <directhex at apebox.org>  Tue, 22 Jun 2010 08:53:51 +0100
 
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