[commit: ghc] wip/remove-cabal-dep: Update Cabal and haddock to follow the Canal-dep removal changes (97d95b1)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/remove-cabal-dep
Link       : http://ghc.haskell.org/trac/ghc/changeset/97d95b14acada7dc2d9b39dd4f65c6ffb288391f/ghc

>---------------------------------------------------------------

commit 97d95b14acada7dc2d9b39dd4f65c6ffb288391f
Author: Duncan Coutts <duncan at well-typed.com>
Date:   Wed Aug 27 13:57:46 2014 +0100

    Update Cabal and haddock to follow the Canal-dep removal changes
    
    In particular, Cabal was still in one place using old file-style package
    databases. Haddock just needed simple changes to follow the change of
    representation of packages in the ghc library.


>---------------------------------------------------------------

97d95b14acada7dc2d9b39dd4f65c6ffb288391f
 libraries/Cabal | 2 +-
 utils/haddock   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 6cc4699..8d59dc9 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 6cc46998f0778c04b535c805416604995fe153b5
+Subproject commit 8d59dc9fba584a9fdb810f4d84f7f3ccb089dd08
diff --git a/utils/haddock b/utils/haddock
index f32ad30..b2a807d 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit f32ad30e9b8c5d4ee54c60c9c3b282fef7d297a5
+Subproject commit b2a807da55d197c648fd2df1f156f9862711d92b