[Pkg-haskell-commits] darcs: ghc: Refresh haddock-hardcode-ghc-paths

[Joachim Breitner]

Mon Oct  8 11:09:53 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh haddock-hardcode-ghc-paths
  Ignore-this: f8d4b8d17a73916376d5631a635d2e94

    M! ./patches/haddock-hardcode-ghc-paths -9 +9

Mon Oct  8 11:09:53 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh haddock-hardcode-ghc-paths
  Ignore-this: f8d4b8d17a73916376d5631a635d2e94
diff -rN -u old-ghc//patches/haddock-hardcode-ghc-paths new-ghc//patches/haddock-hardcode-ghc-paths
--- old-ghc//patches/haddock-hardcode-ghc-paths	2012-10-16 07:59:01.667717722 +0000
+++ new-ghc//patches/haddock-hardcode-ghc-paths	2012-10-16 07:59:01.946997510 +0000
@@ -1,7 +1,7 @@
-Index: ghc-7.4.1/utils/haddock/haddock.cabal
+Index: ghc-7.4.2/utils/haddock/haddock.cabal
 ===================================================================
---- ghc-7.4.1.orig/utils/haddock/haddock.cabal	2012-02-01 19:10:43.000000000 +0100
-+++ ghc-7.4.1/utils/haddock/haddock.cabal	2012-02-03 16:26:39.000000000 +0100
+--- ghc-7.4.2.orig/utils/haddock/haddock.cabal	2012-06-07 03:10:26.000000000 +1000
++++ ghc-7.4.2/utils/haddock/haddock.cabal	2012-06-11 15:24:08.000000000 +1000
 @@ -78,10 +78,6 @@
  
  executable haddock
@@ -11,9 +11,9 @@
 -  if !flag(in-ghc-tree)
 -    build-tools: alex >= 2.3, happy >= 1.18
    build-depends:
-     base >= 4.3 && < 4.6,
+     base >= 4.3 && < 4.7,
      filepath,
-@@ -95,8 +91,6 @@
+@@ -96,8 +92,6 @@
  
    if flag(in-ghc-tree)
      cpp-options: -DIN_GHC_TREE
@@ -31,10 +31,10 @@
  
    if flag(test)
      cpp-options: -DTEST
-Index: ghc-7.4.1/utils/haddock/src/Main.hs
+Index: ghc-7.4.2/utils/haddock/src/Main.hs
 ===================================================================
---- ghc-7.4.1.orig/utils/haddock/src/Main.hs	2012-02-01 19:10:43.000000000 +0100
-+++ ghc-7.4.1/utils/haddock/src/Main.hs	2012-02-03 16:26:39.000000000 +0100
+--- ghc-7.4.2.orig/utils/haddock/src/Main.hs	2012-06-07 03:10:26.000000000 +1000
++++ ghc-7.4.2/utils/haddock/src/Main.hs	2012-06-11 15:24:08.000000000 +1000
 @@ -50,7 +50,6 @@
  #ifdef IN_GHC_TREE
  import System.FilePath
@@ -43,7 +43,7 @@
  import Paths_haddock
  #endif
  
-@@ -344,14 +343,14 @@
+@@ -350,14 +349,14 @@
        libDir <- getInTreeDir
        return (ghcPath, libDir)
  #else