[Pkg-mono-svn-commits] [SCM] mono-tools branch, master, updated. debian/2.10-2-2-g7a5ec6b

[Iain Lane]

The following commit has been merged in the master branch:
commit 62da47c0e9c0def77d762922c712e59c345bfd9c
Author: Iain Lane <laney at debian.org>
Date:   Wed Apr 4 12:06:21 2012 +0100

    Move update-monodoc trigger from monodoc-base (in mono)
    
    The commands being executed from the trigger are in monodoc-browser, so
    it makes sense for the trigger to be here too, then we don't have have
    base attempt to check if -browser is configured, which we could never
    get right.
    
    We need to have Replaces: and Breaks: monodoc-base (<< 2.10.8.1-3) for
    the moved update-monodoc. -3 is the version which will stop shipping
    update-monodoc; we need to make sure that users don't have this on their
    system after the trigger has moved.
    
    LP: #972751

diff --git a/debian/control b/debian/control
index 4e5ed80..e4cb090 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-mono/packages/mono-tools.git
 
 Package: monodoc-browser
 Provides: monodoc-viewer
-Replaces: monodoc-base (<< 1.1.9)
+Replaces: monodoc-base (<< 2.10.8.1-3)
+Breaks: monodoc-base (<< 2.10.8.1-3)
 Architecture: all
 Depends: ${cli:Depends}, monodoc-manual, ${misc:Depends}
 Description: MonoDoc GTK+ based viewer
diff --git a/debian/monodoc-browser.install b/debian/monodoc-browser.install
index acf35b9..76ce562 100644
--- a/debian/monodoc-browser.install
+++ b/debian/monodoc-browser.install
@@ -3,3 +3,4 @@ debian/tmp/usr/lib/monodoc/browser.exe
 debian/tmp/usr/lib/monodoc/WebKitHtmlRender.dll
 debian/tmp/usr/share/pixmaps/monodoc.png
 debian/tmp/usr/share/applications/monodoc.desktop
+debian/update-monodoc /usr/bin
diff --git a/debian/monodoc-browser.postinst b/debian/monodoc-browser.postinst
index 16bc295..3ea456c 100644
--- a/debian/monodoc-browser.postinst
+++ b/debian/monodoc-browser.postinst
@@ -1,9 +1,22 @@
 #!/bin/sh
 set -e
 
-echo "generating monodoc index..."
-monodoc --make-index > /dev/null
-echo "generating monodoc search index... (this can take a while)"
-monodoc --make-search-index > /dev/null
+case "$1" in
+    configure)
+        
+        if [ "$2" = "" ]; then
+            # On first install, generate the index (won't necessarily be triggered).
+            /usr/bin/dpkg-trigger --by-package=monodoc-browser /usr/lib/monodoc/sources
+        fi
+
+        ;;
+
+    triggered)
+
+        /usr/bin/update-monodoc
+
+        ;;
+
+esac
 
 #DEBHELPER#
diff --git a/debian/monodoc-browser.triggers b/debian/monodoc-browser.triggers
new file mode 100644
index 0000000..f94effd
--- /dev/null
+++ b/debian/monodoc-browser.triggers
@@ -0,0 +1 @@
+interest /usr/lib/monodoc/sources
diff --git a/debian/monodoc-browser.postinst b/debian/update-monodoc
old mode 100644
new mode 100755
similarity index 77%
copy from debian/monodoc-browser.postinst
copy to debian/update-monodoc
index 16bc295..a9cdbab
--- a/debian/monodoc-browser.postinst
+++ b/debian/update-monodoc
@@ -1,9 +1,8 @@
 #!/bin/sh
 set -e
 
-echo "generating monodoc index..."
+echo "generating monodoc search index..."
 monodoc --make-index > /dev/null
+
 echo "generating monodoc search index... (this can take a while)"
 monodoc --make-search-index > /dev/null
-
-#DEBHELPER#

-- 
mono-tools