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

[Jo Shields]

The following commit has been merged in the master branch:
commit 8c8144dfa32ce0ad47da08d7672f79386f295c9a
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Mar 29 16:26:30 2010 +0100

    Fixes from laney for monodoc trigger

diff --git a/debian/changelog b/debian/changelog
index 3199cc0..bce5915 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-mono (2.4.4~svn151842-2~pre1) unstable; urgency=low
+mono (2.4.4~svn151842-2) UNRELEASED; urgency=low
 
+  [ Mirco Bauer ]
   * NOT RELEASED YET
   * debian/control:
     + Changed section of libmono-dev back to cli-mono.
 
+  [ Iain Lane ]
+  * debian/update-monodoc: Check whether monodoc-browser is configured before
+    generating the search index in the trigger. Previously the lack of this
+    caused uninstallability due to monodoc not being able to find GTK# in the
+    GAC. (Closes: #575803)
+
  -- Mirco Bauer <meebey at debian.org>  Sat, 20 Feb 2010 12:13:59 +0100
 
 mono (2.4.4~svn151842-1) unstable; urgency=medium
diff --git a/debian/update-monodoc b/debian/update-monodoc
index ffa00e2..beb30c2 100755
--- a/debian/update-monodoc
+++ b/debian/update-monodoc
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-if [ ! -x /usr/lib/monodoc/browser.exe ]; then
+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
 	exit 0
 fi

-- 
mono