[Pkg-haskell-commits] darcs: haskell-haddock: Further patch around missing ghci support, complete patch taken from getallinfo-nothing-ghci-566331 in ghc6.

[Joachim Breitner]

Fri Jul  2 07:58:22 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Further patch around missing ghci support, complete patch taken from getallinfo-nothing-ghci-566331 in ghc6.
  Ignore-this: de7a255abc399409c86837ee4e5fb87

    M ./changelog +7
    M ./patches/build_without_ghci.patch +16

Fri Jul  2 07:58:22 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Further patch around missing ghci support, complete patch taken from getallinfo-nothing-ghci-566331 in ghc6.
  Ignore-this: de7a255abc399409c86837ee4e5fb87
diff -rN -u old-haskell-haddock/changelog new-haskell-haddock/changelog
--- old-haskell-haddock/changelog	2010-07-02 08:00:34.065257409 +0000
+++ new-haskell-haddock/changelog	2010-07-02 08:00:34.077258044 +0000
@@ -1,3 +1,10 @@
+haskell-haddock (2.7.2-4) UNRELEASED; urgency=low
+
+  * Further patch around missing ghci support, complete patch taken from
+    getallinfo-nothing-ghci-566331 in ghc6.
+
+ -- Joachim Breitner <nomeata at debian.org>  Fri, 02 Jul 2010 09:57:42 +0200
+
 haskell-haddock (2.7.2-3) unstable; urgency=low
 
   * Patch around missing ghci support, reusing a patch by Marco Túlio Gontijo
diff -rN -u old-haskell-haddock/patches/build_without_ghci.patch new-haskell-haddock/patches/build_without_ghci.patch
--- old-haskell-haddock/patches/build_without_ghci.patch	2010-07-02 08:00:34.061257198 +0000
+++ new-haskell-haddock/patches/build_without_ghci.patch	2010-07-02 08:00:34.065257409 +0000
@@ -63,3 +63,19 @@
    hs-source-dirs:       src
    extensions:           CPP, PatternGuards, DeriveDataTypeable,
                          ScopedTypeVariables, MagicHash
+Index: haskell-haddock-2.7.2/src/Haddock/Interface/Create.hs
+===================================================================
+--- haskell-haddock-2.7.2.orig/src/Haddock/Interface/Create.hs	2010-03-20 15:47:22.000000000 +0100
++++ haskell-haddock-2.7.2/src/Haddock/Interface/Create.hs	2010-07-02 09:57:33.000000000 +0200
+@@ -501,7 +501,11 @@
+         Nothing -> do
+           -- If we can't find the declaration, it must belong to
+           -- another package
++#ifdef GHCI
+           mbTyThing <- liftGhcToErrMsgGhc $ lookupName t
++#else
++          mbTyThing <- liftGhcToErrMsgGhc $ lookupGlobalName t
++#endif
+           -- show the name as exported as well as the name's
+           -- defining module (because the latter is where we
+           -- looked for the .hi/.haddock).  It's to help people