[commit: packages/Cabal] ghc-head: Merge 'D.Compat.Exception' and 'D.Client.Compat.Exception'. (33c0d90)

[git at git.haskell.org]

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

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=33c0d90ee41e25a4713b865b09a285c5fec8df5b

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

commit 33c0d90ee41e25a4713b865b09a285c5fec8df5b
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Fri Aug 23 06:13:17 2013 +0200

    Merge 'D.Compat.Exception' and 'D.Client.Compat.Exception'.


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

33c0d90ee41e25a4713b865b09a285c5fec8df5b
 Cabal/Cabal.cabal                                  |    2 +-
 Cabal/Distribution/Compat/Exception.hs             |   27 +++++++++++++--
 .../Distribution/Client/Compat/Environment.hs      |    2 +-
 .../Distribution/Client/Compat/Exception.hs        |   35 --------------------
 .../Distribution/Client/Compat/Semaphore.hs        |    2 +-
 cabal-install/Distribution/Client/Config.hs        |    6 ++--
 cabal-install/Distribution/Client/IndexUtils.hs    |    2 +-
 cabal-install/Distribution/Client/Install.hs       |    2 +-
 .../Distribution/Client/InstallSymlink.hs          |    2 +-
 cabal-install/Distribution/Client/JobControl.hs    |    2 +-
 .../Client/Sandbox/PackageEnvironment.hs           |    3 +-
 .../Distribution/Client/Sandbox/Timestamp.hs       |    2 +-
 cabal-install/Distribution/Client/SetupWrapper.hs  |    2 +-
 cabal-install/Distribution/Client/Utils.hs         |    2 +-
 cabal-install/Distribution/Client/World.hs         |    2 +-
 cabal-install/cabal-install.cabal                  |    1 -
 16 files changed, 39 insertions(+), 55 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 33c0d90ee41e25a4713b865b09a285c5fec8df5b