simonmar 2006/02/02 05:01:03 PST
Modified files: (Branch: ghc-6-4-branch)
ghc/lib/compat Makefile compat.mk
libraries/Cabal Cabal.cabal Makefile package.conf.in
libraries/Cabal/Distribution Extension.hs
InstalledPackageInfo.hs Make.hs
Package.hs PackageDescription.hs
ParseUtils.hs PreProcess.hs
Setup.hs Simple.hs Version.hs
libraries/Cabal/Distribution/Compat Directory.hs FilePath.hs
ReadP.hs
libraries/Cabal/Distribution/PreProcess Unlit.hs
libraries/Cabal/Distribution/Simple Build.hs Configure.hs
GHCPackageConfig.hs
Install.hs
LocalBuildInfo.hs
Register.hs SrcDist.hs
Utils.hs
libraries/Cabal/doc Cabal.xml
Added files: (Branch: ghc-6-4-branch)
ghc/lib/compat/Distribution Compiler.hs
ghc/lib/compat/Distribution/Compat FilePath.hs
ghc/lib/compat/Language/Haskell Extension.hs
libraries/Cabal runTests.sh
libraries/Cabal/Distribution Compiler.hs Program.hs
libraries/Cabal/Language/Haskell Extension.hs
Removed files: (Branch: ghc-6-4-branch)
ghc/lib/compat/Distribution Extension.hs Setup.hs
Log:
Bring the latest Cabal into the 6.4 branch. It was decided that
having an old buggy Cabal in 6.4.2 would be worse than potentially
breaking a few Setup.hs scripts.
Revision Changes Path
1.16.2.7 +9 -3 fptools/ghc/lib/compat/Makefile
1.1.2.3 +2 -0 fptools/ghc/lib/compat/compat.mk
1.5.2.3 +40 -34 fptools/libraries/Cabal/Cabal.cabal
1.6.2.2 +4 -1 fptools/libraries/Cabal/Makefile
1.13.2.4 +7 -2 fptools/libraries/Cabal/package.conf.in
1.5.2.1 +6 -147 fptools/libraries/Cabal/Distribution/Extension.hs
1.10.2.11 +5 -6
fptools/libraries/Cabal/Distribution/InstalledPackageInfo.hs
1.13.2.6 +41 -37 fptools/libraries/Cabal/Distribution/Make.hs
1.5.2.1 +1 -1 fptools/libraries/Cabal/Distribution/Package.hs
1.32.2.15 +178 -113
fptools/libraries/Cabal/Distribution/PackageDescription.hs
1.13.2.4 +30 -16 fptools/libraries/Cabal/Distribution/ParseUtils.hs
1.23.2.9 +62 -40 fptools/libraries/Cabal/Distribution/PreProcess.hs
1.21.2.10 +320 -181 fptools/libraries/Cabal/Distribution/Setup.hs
1.43.2.24 +367 -158 fptools/libraries/Cabal/Distribution/Simple.hs
1.7.2.2 +3 -3 fptools/libraries/Cabal/Distribution/Version.hs
1.7.2.3 +5 -5 fptools/libraries/Cabal/Distribution/Compat/Directory.hs
1.12.2.3 +51 -31 fptools/libraries/Cabal/Distribution/Compat/FilePath.hs
1.7.2.6 +1 -1 fptools/libraries/Cabal/Distribution/Compat/ReadP.hs
1.1.4.2 +1 -1 fptools/libraries/Cabal/Distribution/PreProcess/Unlit.hs
1.31.2.13 +423 -118 fptools/libraries/Cabal/Distribution/Simple/Build.hs
1.18.2.10 +158 -129 fptools/libraries/Cabal/Distribution/Simple/Configure.hs
1.8.2.2 +4 -4
fptools/libraries/Cabal/Distribution/Simple/GHCPackageConfig.hs
1.24.2.11 +100 -65 fptools/libraries/Cabal/Distribution/Simple/Install.hs
1.6.2.2 +233 -15
fptools/libraries/Cabal/Distribution/Simple/LocalBuildInfo.hs
1.17.2.14 +21 -23 fptools/libraries/Cabal/Distribution/Simple/Register.hs
1.13.2.5 +57 -16 fptools/libraries/Cabal/Distribution/Simple/SrcDist.hs
1.25.2.8 +97 -125 fptools/libraries/Cabal/Distribution/Simple/Utils.hs
1.1.2.24 +885 -389 fptools/libraries/Cabal/doc/Cabal.xml
_______________________________________________
Cvs-ghc mailing list
[EMAIL PROTECTED]
http://www.haskell.org/mailman/listinfo/cvs-ghc
