Fix conflicts

2 files changed, 62 insertions, 139 deletions

diff --git a/haddock-ghc.cabal b/haddock-ghc.cabal
deleted file mode 100644
index b3b91e91..00000000
--- a/haddock-ghc.cabal
+++ /dev/null
@@ -1,101 +0,0 @@
-build-type:           Simple
-name:                 haddock
-version:              2.0
-license:              BSD3
-license-file:         LICENSE
-copyright:            (c) Simon Marlow, David Waern
-author:               Simon Marlow, David Waern
-maintainer:           David Waern <davve@dtek.chalmers.se>
-stability:            stable
-homepage:             http://www.haskell.org/haddock/
-synopsis:             Haddock is a documentation-generation tool for Haskell
-                      libraries
-build-depends:
-  base,
-  haskell98,
-  ghc>=6.8,
-  Cabal,
-  filepath,
-  process,
-  directory,
-  pretty,
-  containers,
-  array
-extensions:           CPP, PatternGuards
-ghc-options:          -fglasgow-exts
-hs-source-dirs:       src
-exposed-modules:      Distribution.Haddock
-other-modules:
-  Haddock.Types
-  Haddock.InterfaceFile
-  Haddock.Exception
-data-files:
-  html/haddock-DEBUG.css
-  html/haddock.css
-  html/haddock.js
-  html/haskell_icon.gif
-  html/minus.gif
-	html/plus.gif
-extra-source-files:
-	CHANGES
-	README
-	TODO
-	doc/Makefile
-	doc/README
-	doc/aclocal.m4
-	doc/config.mk.in
-	doc/configure.ac
-	doc/docbook-xml.mk
-	doc/fptools.css
-	doc/haddock.xml
-	examples/A.hs
-	examples/B.hs
-	examples/Bug1.hs
-	examples/Bug2.hs
-	examples/Bug3.hs
-	examples/Bug4.hs
-	examples/Bug6.hs
-	examples/Bug7.hs
-	examples/Bug8.hs
-	examples/Bug9.hs
-	examples/Hash.hs
-	examples/Hidden.hs
-	examples/Makefile
-	examples/NoLayout.hs
-	examples/Test.hs
-	examples/Visible.hs
-	examples/hide-bug/A.hs
-	examples/hide-bug/B.hs
-	examples/hide-bug/C.hs
-	examples/hide-bug/D.hs
-	haddock.spec
-	haskell.vim
-	src/haddock.sh
-
-executable:           haddock
-hs-source-dirs:       src
-main-is:              Main.hs
-extensions:           CPP, PatternGuards
-ghc-options:          -fglasgow-exts -funbox-strict-fields -O2 -fasm
-other-modules:
-  Haddock.Interface.Rename
-  Haddock.Interface.Create
-  Haddock.Interface.AttachInstances
-  Haddock.Utils.FastMutInt2
-  Haddock.Utils.BlockTable
-  Haddock.Utils.Html
-  Haddock.Utils
-  Haddock.Backends.HaddockDB
-  Haddock.Backends.DevHelp
-  Haddock.Backends.HH
-  Haddock.Backends.HH2
-  Haddock.Backends.Hoogle
-  Haddock.ModuleTree
-  Haddock.Types
-  Haddock.Version
-  Haddock.InterfaceFile        
-  Haddock.Exception
-  Haddock.Options
-  Haddock.GHC.Typecheck
-  Haddock.GHC.Utils
-  Haddock.GHC
diff --git a/haddock.cabal b/haddock.cabal
index c4202436..b3b91e91 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,21 +1,40 @@
-name: haddock
-cabal-version: >=1.1.4
-version: 2.0
-license: BSD3
-license-file: LICENSE
-copyright: (c) Simon Marlow
-author: Simon Marlow
-maintainer: Simon Marlow <simonmar@microsoft.com>
-stability: stable
-homepage: http://www.haskell.org/haddock/
-synopsis: Haddock is a documentation-generation tool for Haskell libraries
-build-depends: base>=1.0, haskell98>=1.0, mtl>=1.0, network>=1.0
+build-type:           Simple
+name:                 haddock
+version:              2.0
+license:              BSD3
+license-file:         LICENSE
+copyright:            (c) Simon Marlow, David Waern
+author:               Simon Marlow, David Waern
+maintainer:           David Waern <davve@dtek.chalmers.se>
+stability:            stable
+homepage:             http://www.haskell.org/haddock/
+synopsis:             Haddock is a documentation-generation tool for Haskell
+                      libraries
+build-depends:
+  base,
+  haskell98,
+  ghc>=6.8,
+  Cabal,
+  filepath,
+  process,
+  directory,
+  pretty,
+  containers,
+  array
+extensions:           CPP, PatternGuards
+ghc-options:          -fglasgow-exts
+hs-source-dirs:       src
+exposed-modules:      Distribution.Haddock
+other-modules:
+  Haddock.Types
+  Haddock.InterfaceFile
+  Haddock.Exception
 data-files:
-	html/haddock-DEBUG.css
-	html/haddock.css
-	html/haddock.js
-	html/haskell_icon.gif
-	html/minus.gif
+  html/haddock-DEBUG.css
+  html/haddock.css
+  html/haddock.js
+  html/haskell_icon.gif
+  html/minus.gif
 	html/plus.gif
 extra-source-files:
 	CHANGES
@@ -53,25 +72,30 @@ extra-source-files:
 	haskell.vim
 	src/haddock.sh
 
-executable: haddock-ghc
-hs-source-dirs: src
-main-is: Main.hs
-extensions: CPP, PatternGuards
+executable:           haddock
+hs-source-dirs:       src
+main-is:              Main.hs
+extensions:           CPP, PatternGuards
+ghc-options:          -fglasgow-exts -funbox-strict-fields -O2 -fasm
 other-modules:
-	FastMutInt2
-	BlockTable
-	HaddockDB
-	HaddockDevHelp
-	HaddockHH
-	HaddockHH2
-	HaddockHoogle
-	HaddockHtml
-	HaddockModuleTree
-	HaddockRename
-	HaddockTypes
-	HaddockUtil
-	HaddockVersion
-	Html
-	GHCUtils
-	Main
- 
+  Haddock.Interface.Rename
+  Haddock.Interface.Create
+  Haddock.Interface.AttachInstances
+  Haddock.Utils.FastMutInt2
+  Haddock.Utils.BlockTable
+  Haddock.Utils.Html
+  Haddock.Utils
+  Haddock.Backends.HaddockDB
+  Haddock.Backends.DevHelp
+  Haddock.Backends.HH
+  Haddock.Backends.HH2
+  Haddock.Backends.Hoogle
+  Haddock.ModuleTree
+  Haddock.Types
+  Haddock.Version
+  Haddock.InterfaceFile        
+  Haddock.Exception
+  Haddock.Options
+  Haddock.GHC.Typecheck
+  Haddock.GHC.Utils
+  Haddock.GHC