[Pkg-haskell-commits] darcs: ghc: Remove ghc-doc dependency on ghc, it did not have the desired effect. Instead call ghc-pkg recache in ghc-doc’s trigger as well.

[Joachim Breitner]

Sat Jul 23 07:31:17 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Remove ghc-doc dependency on ghc, it did not have the desired effect. Instead call ghc-pkg recache in ghc-doc[_\e2_][_\80_][_\99_]s trigger as well. 
  Ignore-this: a162876a64d4e726cbb9dc0ada2a216f

    M ./changelog +7
    M ./control -1 +1
    M ./ghc-doc.postinst +1

Sat Jul 23 07:31:17 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Remove ghc-doc dependency on ghc, it did not have the desired effect. Instead call ghc-pkg recache in ghc-doc’s trigger as well. 
  Ignore-this: a162876a64d4e726cbb9dc0ada2a216f
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2011-07-23 07:31:22.833057234 +0000
+++ new-ghc//changelog	2011-07-23 07:31:22.837062473 +0000
@@ -1,3 +1,10 @@
+ghc (7.0.4-5) UNRELEASED; urgency=low
+
+  * Remove ghc-doc dependency on ghc, it did not have the desired effect.
+    Instead call ghc-pkg recache in ghc-doc’s trigger as well. 
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 23 Jul 2011 09:29:41 +0200
+
 ghc (7.0.4-4) unstable; urgency=low
 
   * Let ghc-doc depend on ghc. It already does via ghc-haddock, making this
diff -rN -u old-ghc//control new-ghc//control
--- old-ghc//control	2011-07-23 07:31:22.829061270 +0000
+++ new-ghc//control	2011-07-23 07:31:22.841060590 +0000
@@ -66,7 +66,7 @@
 Provides: ${provided-docs}
 Replaces: ghc6-doc (<< 7)
 Conflicts: ghc6-doc (<< 7), ghc (<= 7.0.3-1)
-Depends: ghc, ${haddock:Depends}, ${misc:Depends}, perl
+Depends: ${haddock:Depends}, ${misc:Depends}, perl
 Description: Documentation for the Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
  Haskell.
diff -rN -u old-ghc//ghc-doc.postinst new-ghc//ghc-doc.postinst
--- old-ghc//ghc-doc.postinst	2011-07-23 07:31:22.821058727 +0000
+++ new-ghc//ghc-doc.postinst	2011-07-23 07:31:22.849061033 +0000
@@ -41,6 +41,7 @@
             fi
         done
 
+	if test -x /usr/lib/ghc/bin/ghc-pkg; then /usr/lib/ghc/bin/ghc-pkg recache --global; fi
         /usr/lib/ghc-doc/gen_contents_index
 	;;
     abort-upgrade|abort-remove|abort-deconfigure)