[Pkg-haskell-commits] darcs: ghc: Refresh patches

[Joachim Breitner]

Fri Feb  3 15:27:24 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patches
  Ignore-this: 362706b8d0903e4e417da5e7c9df50ad

    M ./patches/haddock-hardcode-ghc-paths -7 +7
    M ./patches/haddock-no-library -71 +7

Fri Feb  3 15:27:24 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patches
  Ignore-this: 362706b8d0903e4e417da5e7c9df50ad
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-02-03 16:45:20.467249203 +0000
+++ new-ghc//patches/haddock-hardcode-ghc-paths	2012-02-03 16:45:20.511250372 +0000
@@ -1,7 +1,7 @@
-Index: ghc-7.4.0.20111219/utils/haddock/haddock.cabal
+Index: ghc-7.4.1/utils/haddock/haddock.cabal
 ===================================================================
---- ghc-7.4.0.20111219.orig/utils/haddock/haddock.cabal	2011-12-22 16:18:59.000000000 +0100
-+++ ghc-7.4.0.20111219/utils/haddock/haddock.cabal	2011-12-22 22:53:25.000000000 +0100
+--- 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
 @@ -78,10 +78,6 @@
  
  executable haddock
@@ -22,7 +22,7 @@
  
    if flag(test)
      cpp-options: -DTEST
-@@ -158,8 +152,6 @@
+@@ -157,8 +151,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.0.20111219/utils/haddock/src/Main.hs
+Index: ghc-7.4.1/utils/haddock/src/Main.hs
 ===================================================================
---- ghc-7.4.0.20111219.orig/utils/haddock/src/Main.hs	2011-12-22 16:18:59.000000000 +0100
-+++ ghc-7.4.0.20111219/utils/haddock/src/Main.hs	2011-12-22 21:26:51.000000000 +0100
+--- 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
 @@ -50,7 +50,6 @@
  #ifdef IN_GHC_TREE
  import System.FilePath
diff -rN -u old-ghc//patches/haddock-no-library new-ghc//patches/haddock-no-library
--- old-ghc//patches/haddock-no-library	2012-02-03 16:45:20.407249743 +0000
+++ new-ghc//patches/haddock-no-library	2012-02-03 16:45:20.511250372 +0000
@@ -1,78 +1,14 @@
-Index: ghc-7.4.0.20120108/utils/haddock/haddock.cabal
+Index: ghc-7.4.1/utils/haddock/haddock.cabal
 ===================================================================
---- ghc-7.4.0.20120108.orig/utils/haddock/haddock.cabal	2012-01-09 13:20:35.000000000 +0100
-+++ ghc-7.4.0.20120108/utils/haddock/haddock.cabal	2012-01-09 13:21:10.000000000 +0100
-@@ -131,73 +131,6 @@
-     Haddock.Options
-     Haddock.GhcUtils
+--- ghc-7.4.1.orig/utils/haddock/haddock.cabal	2012-02-03 16:26:39.000000000 +0100
++++ ghc-7.4.1/utils/haddock/haddock.cabal	2012-02-03 16:27:13.000000000 +0100
+@@ -196,8 +196,7 @@
      Haddock.Convert
--   
--library
--  default-language:     Haskell2010
--  -- In a GHC tree - in particular, in a source tarball - we don't
--  -- require alex or happy
--  if !flag(in-ghc-tree)
--    build-tools: alex >= 2.3, happy >= 1.18
--  build-depends:
--    base >= 4.3 && < 4.6,
--    filepath,
--    directory,
--    pretty,
--    containers,
--    array,
--    xhtml >= 3000.2 && < 3000.3,
--    Cabal >= 1.10,
--    ghc >= 7.2 && < 7.6
--
--  if flag(in-ghc-tree)
--    cpp-options: -DIN_GHC_TREE
--
--  if flag(test)
--    cpp-options: -DTEST
--    build-depends: QuickCheck >= 2.1 && < 3
--
--  hs-source-dirs:       src
--  default-extensions:   CPP, DeriveDataTypeable,
--                        ScopedTypeVariables, MagicHash
--  ghc-options:          -funbox-strict-fields -O2 -Wall -fwarn-tabs
--
--  exposed-modules:
--    Documentation.Haddock
--
--  other-modules:
--    Main
--    Haddock.Interface
--    Haddock.Interface.Rename
--    Haddock.Interface.Create
--    Haddock.Interface.AttachInstances
--    Haddock.Interface.LexParseRn
--    Haddock.Interface.ParseModuleHeader
--    Haddock.Lex
--    Haddock.Parse
--    Haddock.Utils
--    Haddock.Backends.Xhtml
--    Haddock.Backends.Xhtml.Decl
--    Haddock.Backends.Xhtml.DocMarkup
--    Haddock.Backends.Xhtml.Layout
--    Haddock.Backends.Xhtml.Names
--    Haddock.Backends.Xhtml.Themes
--    Haddock.Backends.Xhtml.Types
--    Haddock.Backends.Xhtml.Utils
--    Haddock.Backends.LaTeX
--    Haddock.Backends.HaddockDB
--    Haddock.Backends.Hoogle
--    Haddock.ModuleTree
--    Haddock.Types
--    Haddock.Doc
--    Haddock.Version
--    Haddock.InterfaceFile
--    Haddock.Options
--    Haddock.GhcUtils
--    Haddock.Convert
--    Paths_haddock
--  
+     Paths_haddock
+   
 -  if flag(in-ghc-tree)
 -    buildable: False
++  buildable: False
  
  test-suite html-tests
    type:             exitcode-stdio-1.0