[Pkg-mono-svn-commits] [SCM] mono-tools branch, master, updated. debian/2.10-4-3-g995c169

[Iain Lane]

The following commit has been merged in the master branch:
commit 88171909f0b033b1d2c8cd0f85b27e09b731e9b9
Author: Iain Lane <laney at debian.org>
Date:   Thu Jul 12 11:50:49 2012 +0100

    Call gac-install instead of gac-package-install to install mono
    
    gac-package-install is for installing /packages/ into the GAC.
    gac-install is for initialising the gac itself. It wasn't right to call
    gac-package-install here.
    
    Also, check that required files exist before proceeding.
    
    Closes: #681320

diff --git a/debian/monodoc-browser.postinst b/debian/monodoc-browser.postinst
index 5b83f65..4306784 100644
--- a/debian/monodoc-browser.postinst
+++ b/debian/monodoc-browser.postinst
@@ -24,13 +24,15 @@ case "$1" in
         # proceed anyway. Failure isn't harmful.
         mono_gac_status=`dpkg-query -f '${Status}' -W mono-gac`
         if [ "$mono_gac_status" != "install ok installed" -a \
-            -x /usr/share/cli-common/gac-install ]; then
-            /usr/share/cli-common/gac-package-install mono || true
+            -x /usr/share/cli-common/gac-install -a \
+            -e /usr/share/cli-common/runtimes.d/mono ]; then
+            /usr/share/cli-common/gac-install mono || true
         fi
 
         libgtk_cil_status=`dpkg-query -f '${Status}' -W libgtk2.0-cil`
         if [ "$libgtk_cil_status" != "install ok installed" -a \
-            -x /usr/share/cli-common/gac-package-install ]; then
+            -x /usr/share/cli-common/gac-package-install -a \ 
+            -e /usr/share/cli-common/packages.d/libgtk2.0-cil.installcligac ]; then
             /usr/share/cli-common/gac-package-install libgtk2.0-cil || true
         fi
 

-- 
mono-tools