[commit: vector] simd: Resolve conflict (b058e75)

[Geoffrey Mainland]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : simd

http://hackage.haskell.org/trac/ghc/changeset/b058e75fa2c5b584c3a027c08e6e134a3deb2b70

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

commit b058e75fa2c5b584c3a027c08e6e134a3deb2b70
Author: Roman Leshchinskiy <rl at cse.unsw.edu.au>
Date:   Sun Jan 29 11:32:49 2012 +0000

    Resolve conflict

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

 vector.cabal |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vector.cabal b/vector.cabal
index 939e4a4..dae8591 100644
--- a/vector.cabal
+++ b/vector.cabal
@@ -171,7 +171,10 @@ Library
   Install-Includes:
         vector.h
 
-  Build-Depends: base >= 4 && < 5, primitive >= 0.4.0.1 && < 0.5, ghc-prim
+  Build-Depends: base >= 4 && < 5
+               , primitive >= 0.4.9 && < 0.6
+               , ghc-prim
+               , deepseq >= 1.1 && < 1.4
 
   if impl(ghc<6.13)
     Ghc-Options: -finline-if-enough-args -fno-method-sharing