[Pkg-haskell-commits] [SCM] Haskell Database Connectivity branch, upstream, updated. debian/2.1.0-2-18-ge5b06e3

John Goerzen jgoerzen at complete.org
Tue Apr 6 20:29:53 UTC 2010


The following commit has been merged in the upstream branch:
commit a83b17a3e6d087685e6375e02501e94184d2d945
Author: Simon Hengel <simon.hengel at wiktory.org>
Date:   Sun Apr 4 19:36:03 2010 +0200

    - workaround for #206 1/2] Add missing dependencies for 'runtests' to cabal file
    
    We now use the same list of dependencies as for the library, extended
    with HUnit, QuickCheck and testpack.

diff --git a/HDBC.cabal b/HDBC.cabal
index dd4640b..dfa63a2 100644
--- a/HDBC.cabal
+++ b/HDBC.cabal
@@ -57,6 +57,22 @@ Executable runtests
    if flag(buildtests)
       Buildable: True
       Build-Depends: HUnit, QuickCheck, testpack
+
+      if flag(splitBase)
+        Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <=1.1.4, bytestring, containers, old-locale
+        if flag(time_gte_113)
+          Build-Depends: time>=1.1.3
+          CPP-OPTIONS: -DTIME_GT_113
+        else
+          Build-Depends: time<1.1.3
+      else
+        Build-Depends: base<3
+      Build-Depends: mtl, convertible >= 1.0.1, utf8-string
+
+      -- Hack for cabal-install weirdness.  cabal-install forces base 3,
+      -- though it works fine for Setup.lhs manually.  Fix.
+      if impl(ghc >= 6.9)
+         build-depends: base >= 4
    else
       Buildable: False
    Main-Is: runtests.hs

-- 
Haskell Database Connectivity



More information about the Pkg-haskell-commits mailing list