[commit: Cabal] master: Be less strict in requirements of upgrade (9d69836)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9d698365c980219e04ae71bef7b7b18b85dfdfb4

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

commit 9d698365c980219e04ae71bef7b7b18b85dfdfb4
Author: Duncan Coutts <duncan at haskell.org>
Date:   Sun Aug 24 20:02:44 2008 +0000

    Be less strict in requirements of upgrade
    Require current or later version, rather than strictly later
    verison. There may be dependencies that cannot be upgraded.

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

 cabal-install/Distribution/Client/Dependency.hs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cabal-install/Distribution/Client/Dependency.hs b/cabal-install/Distribution/Client/Dependency.hs
index b8ca331..077b8a3 100644
--- a/cabal-install/Distribution/Client/Dependency.hs
+++ b/cabal-install/Distribution/Client/Dependency.hs
@@ -35,7 +35,7 @@ import Distribution.Package
          ( PackageIdentifier(..), packageVersion, packageName
          , Dependency(..), Package(..), PackageFixedDeps(..) )
 import Distribution.Version
-         ( VersionRange(LaterVersion) )
+         ( orLaterVersion )
 import Distribution.Compiler
          ( CompilerId )
 import Distribution.System
@@ -166,7 +166,7 @@ upgradableDependencies :: PackageIndex InstalledPackageInfo
                        -> PackageIndex AvailablePackage
                        -> [Dependency]
 upgradableDependencies installed available =
-  [ Dependency name (LaterVersion latestVersion)
+  [ Dependency name (orLaterVersion latestVersion)
     -- This is really quick (linear time). The trick is that we're doing a
     -- merge join of two tables. We can do it as a merge because they're in
     -- a comparable order because we're getting them from the package indexs.