[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.12.1-4.dsc

[Kari Pahula]

Thu Jan 28 09:46:55 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-4.dsc

    M ./changelog +8
    M ./patches/getallinfo-nothing-ghci-566331 +16

Thu Jan 28 09:46:55 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-4.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:07:36.517020197 +0000
+++ new-ghc/changelog	2011-01-15 06:07:36.593024200 +0000
@@ -1,3 +1,11 @@
+ghc6 (6.12.1-4) experimental; urgency=low
+
+  * Patched utils/haddock/src/Haddock/Interface/Create.hs to use
+    lookupGlobalName instead of lookupName when GHCI is
+    unavailable. (Closes: #566331)
+
+ -- Kari Pahula <kaol at debian.org>  Thu, 28 Jan 2010 11:46:55 +0200
+
 ghc6 (6.12.1-3) experimental; urgency=low
 
   * Updated ghc-pkg's man page.
diff -rN -u old-ghc/patches/getallinfo-nothing-ghci-566331 new-ghc/patches/getallinfo-nothing-ghci-566331
--- old-ghc/patches/getallinfo-nothing-ghci-566331	2011-01-15 06:07:36.513019987 +0000
+++ new-ghc/patches/getallinfo-nothing-ghci-566331	2011-01-15 06:07:36.529020829 +0000
@@ -37,3 +37,19 @@
  
  --------------------------------------------------------------------------------
  -- Collecting and sorting instances
+Index: ghc6-6.12.1/utils/haddock/src/Haddock/Interface/Create.hs
+===================================================================
+--- ghc6-6.12.1.orig/utils/haddock/src/Haddock/Interface/Create.hs	2010-01-28 10:28:29.000000000 +0200
++++ ghc6-6.12.1/utils/haddock/src/Haddock/Interface/Create.hs	2010-01-28 10:29:26.000000000 +0200
+@@ -495,7 +495,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