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

[Joachim Breitner]

Sat Jan 15 07:08:33 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh haddock-hardcode-ghc-paths
  Ignore-this: 7781db289ea6a6a3dc3d8ed669efaf61

    M ./patches/haddock-hardcode-ghc-paths -10 +10

Sat Jan 15 07:08:33 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh haddock-hardcode-ghc-paths
  Ignore-this: 7781db289ea6a6a3dc3d8ed669efaf61
diff -rN -u old-ghc/patches/haddock-hardcode-ghc-paths new-ghc/patches/haddock-hardcode-ghc-paths
--- old-ghc/patches/haddock-hardcode-ghc-paths	2011-01-15 07:13:03.555818092 +0000
+++ new-ghc/patches/haddock-hardcode-ghc-paths	2011-01-15 07:13:03.571818934 +0000
@@ -1,20 +1,20 @@
-Index: ghc6-6.12.1/utils/haddock/haddock.cabal
+Index: ghc-7.0.1/utils/haddock/haddock.cabal
 ===================================================================
---- ghc6-6.12.1.orig/utils/haddock/haddock.cabal	2010-02-09 12:30:41.000000000 +0200
-+++ ghc6-6.12.1/utils/haddock/haddock.cabal	2010-02-09 12:31:40.000000000 +0200
-@@ -77,8 +77,6 @@
+--- ghc-7.0.1.orig/utils/haddock/haddock.cabal	2010-11-12 23:40:08.000000000 +0530
++++ ghc-7.0.1/utils/haddock/haddock.cabal	2011-01-15 12:38:27.000000000 +0530
+@@ -87,8 +87,6 @@
    if flag(in-ghc-tree)
      cpp-options: -DIN_GHC_TREE
      extensions: ForeignFunctionInterface
 -  else
 -    build-depends: ghc-paths
  
-   main-is:              Main.hs
-   hs-source-dirs:       src
-Index: ghc6-6.12.1/utils/haddock/src/Main.hs
+   if flag(test)
+     cpp-options: -DTEST
+Index: ghc-7.0.1/utils/haddock/src/Main.hs
 ===================================================================
---- ghc6-6.12.1.orig/utils/haddock/src/Main.hs	2010-02-09 12:30:51.000000000 +0200
-+++ ghc6-6.12.1/utils/haddock/src/Main.hs	2010-02-09 12:32:35.000000000 +0200
+--- ghc-7.0.1.orig/utils/haddock/src/Main.hs	2010-11-12 23:40:08.000000000 +0530
++++ ghc-7.0.1/utils/haddock/src/Main.hs	2011-01-15 12:38:27.000000000 +0530
 @@ -50,7 +50,6 @@
  #ifdef IN_GHC_TREE
  import System.FilePath
@@ -23,7 +23,7 @@
  import Paths_haddock
  #endif
  
-@@ -348,7 +347,7 @@
+@@ -334,7 +333,7 @@
  #ifdef IN_GHC_TREE
        getInTreeLibDir
  #else