[commit: ghc] master: Update Cabal submodule to latest tip of 1.20 branch (dbe0b8c)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dbe0b8c28b846224fc6226e24780999dd88ea3ef/ghc

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

commit dbe0b8c28b846224fc6226e24780999dd88ea3ef
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Apr 17 16:12:23 2014 +0200

    Update Cabal submodule to latest tip of 1.20 branch
    
    The testsuite reference output for ghcpkg01 needs to be adapted
    since a "More diff friendly pretty printing of cabal files"
    is now performed.


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

dbe0b8c28b846224fc6226e24780999dd88ea3ef
 libraries/Cabal                       |    2 +-
 testsuite/tests/cabal/ghcpkg01.stdout |  108 ++++++++-------------------------
 2 files changed, 25 insertions(+), 85 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index aaa6183..045c843 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit aaa6183dba81d77637dff84f83136639d40f268f
+Subproject commit 045c843f295ba1487ce39dd7b2d02cd333755c75
diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout
index 5a74666..da50cd9 100644
--- a/testsuite/tests/cabal/ghcpkg01.stdout
+++ b/testsuite/tests/cabal/ghcpkg01.stdout
@@ -10,29 +10,19 @@ maintainer: glasgow-haskell-users at haskell.org
 stability: stable
 homepage: http://www.haskell.org/ghc
 package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package
+description:
+    A Test Package
 category: none
 author: simonmar at microsoft.com
 exposed: True
-exposed-modules: A
+exposed-modules:
+    A
 hidden-modules: B C.D
 trusted: False
 import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 hs-libraries: testpkg-1.2.3.4
-extra-libraries:
-extra-ghci-libraries:
 include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
 pkgroot: 
 
 name: testpkg
@@ -44,29 +34,19 @@ maintainer: glasgow-haskell-users at haskell.org
 stability: stable
 homepage: http://www.haskell.org/ghc
 package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package
+description:
+    A Test Package
 category: none
 author: simonmar at microsoft.com
 exposed: True
-exposed-modules: A
+exposed-modules:
+    A
 hidden-modules: B C.D
 trusted: False
 import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 hs-libraries: testpkg-1.2.3.4
-extra-libraries:
-extra-ghci-libraries:
 include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
 pkgroot: 
 
 import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
@@ -84,29 +64,19 @@ maintainer: glasgow-haskell-users at haskell.org
 stability: unstable
 homepage: http://www.haskell.org/ghc
 package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package (new version)
+description:
+    A Test Package (new version)
 category: none
 author: simonmar at microsoft.com
 exposed: False
-exposed-modules: A
+exposed-modules:
+    A
 hidden-modules: B C.D C.E
 trusted: False
 import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 hs-libraries: testpkg-2.0
-extra-libraries:
-extra-ghci-libraries:
 include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
 pkgroot: 
 
 name: testpkg
@@ -118,29 +88,19 @@ maintainer: glasgow-haskell-users at haskell.org
 stability: unstable
 homepage: http://www.haskell.org/ghc
 package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package (new version)
+description:
+    A Test Package (new version)
 category: none
 author: simonmar at microsoft.com
 exposed: False
-exposed-modules: A
+exposed-modules:
+    A
 hidden-modules: B C.D C.E
 trusted: False
 import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 hs-libraries: testpkg-2.0
-extra-libraries:
-extra-ghci-libraries:
 include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
 pkgroot: 
 ---
 name: testpkg
@@ -152,29 +112,19 @@ maintainer: glasgow-haskell-users at haskell.org
 stability: stable
 homepage: http://www.haskell.org/ghc
 package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package
+description:
+    A Test Package
 category: none
 author: simonmar at microsoft.com
 exposed: True
-exposed-modules: A
+exposed-modules:
+    A
 hidden-modules: B C.D
 trusted: False
 import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 hs-libraries: testpkg-1.2.3.4
-extra-libraries:
-extra-ghci-libraries:
 include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
 pkgroot: 
 
 version: 2.0
@@ -193,29 +143,19 @@ maintainer: glasgow-haskell-users at haskell.org
 stability: stable
 homepage: http://www.haskell.org/ghc
 package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package
+description:
+    A Test Package
 category: none
 author: simonmar at microsoft.com
 exposed: False
-exposed-modules: A
+exposed-modules:
+    A
 hidden-modules: B C.D
 trusted: False
 import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 hs-libraries: testpkg-1.2.3.4
-extra-libraries:
-extra-ghci-libraries:
 include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
 pkgroot: 
 
 local01.package.conf: