[commit: packages/Cabal] ghc-head: Merge pull request #1388 from 23Skidoo/with-temp-file-ex (28b8ea7)

[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=28b8ea72e4b24c5ef268c4e2004e2c2d747c4c9f

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

commit 28b8ea72e4b24c5ef268c4e2004e2c2d747c4c9f
Merge: a20fa9d 553c72b
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Fri Jul 19 05:43:56 2013 -0700

    Merge pull request #1388 from 23Skidoo/with-temp-file-ex
    
    Don't change the types of 'withTemp[File,Directory]' in 1.18.



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

28b8ea72e4b24c5ef268c4e2004e2c2d747c4c9f
 Cabal/Distribution/Simple/Configure.hs       |    4 +--
 Cabal/Distribution/Simple/GHC.hs             |    6 ++--
 Cabal/Distribution/Simple/Haddock.hs         |   31 ++++++++++-------
 Cabal/Distribution/Simple/LHC.hs             |    6 ++--
 Cabal/Distribution/Simple/SrcDist.hs         |    2 +-
 Cabal/Distribution/Simple/Utils.hs           |   48 +++++++++++++++++++-------
 cabal-install/Distribution/Client/Haddock.hs |    2 +-
 cabal-install/Distribution/Client/Install.hs |    2 +-
 cabal-install/Distribution/Client/SrcDist.hs |    2 +-
 9 files changed, 67 insertions(+), 36 deletions(-)