Change package name to haddock-ghc, version 0.1

3 files changed, 3 insertions, 80 deletions

diff --git a/haddock.cabal b/haddock.cabal
deleted file mode 100644
index 275cd3f2..00000000
--- a/haddock.cabal
+++ /dev/null
@@ -1,77 +0,0 @@
-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, ghc, network>=1.0, Cabal, FilePath>=0.11
-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-ghc
-hs-source-dirs: src
-main-is: Main.hs
-extensions: CPP, PatternGuards
-other-modules:
-	FastMutInt2
-	BlockTable
-	HaddockDB
-	HaddockDevHelp
-	HaddockHH
-	HaddockHH2
-	HaddockHoogle
-	HaddockHtml
-	HaddockModuleTree
-	HaddockRename
-	HaddockTypes
-	HaddockUtil
-	HaddockVersion
-	Html
-	GHCUtils
-	Main
- 
diff --git a/src/HaddockVersion.hs b/src/HaddockVersion.hs
index 1cade768..205c7de8 100644
--- a/src/HaddockVersion.hs
+++ b/src/HaddockVersion.hs
@@ -8,8 +8,8 @@ module HaddockVersion (
 	projectName, projectVersion, projectUrl
    ) where
 
-import Paths_haddock ( version )
-import Data.Version ( showVersion )
+import Paths_haddock_ghc ( version )
+import Data.Version      ( showVersion )
 
 projectName, projectUrl :: String
 projectName = "Haddock"
diff --git a/src/Main.hs b/src/Main.hs
index 386d4433..fc6dc534 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -14,7 +14,7 @@ import HaddockTypes
 import HaddockUtil
 import HaddockVersion
 import GHCUtils
-import Paths_haddock         ( getDataDir, compilerPath )
+import Paths_haddock_ghc     ( getDataDir, compilerPath )
 
 import Prelude hiding ( catch )
 import Control.Exception     ( catch )