[darcs] also needed to bump containers

Jens Petersen petersen at fedoraproject.org
Fri Nov 26 12:31:36 UTC 2010


commit bf8372681e36a5391a542903ff907d05055cc167
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Nov 26 22:31:40 2010 +1000

    also needed to bump containers

 darcs-2.5-ghc7.patch |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/darcs-2.5-ghc7.patch b/darcs-2.5-ghc7.patch
index 8c614d1..f54b13d 100644
--- a/darcs-2.5-ghc7.patch
+++ b/darcs-2.5-ghc7.patch
@@ -1,7 +1,7 @@
 diff -ur --exclude=_darcs darcs-2.5/darcs.cabal darcs-2.5-ghc7/darcs.cabal
 --- darcs-2.5/darcs.cabal	2010-10-25 01:29:26.000000000 +1000
 +++ darcs-2.5-ghc7/darcs.cabal	2010-11-26 19:38:57.000000000 +1000
-@@ -166,14 +166,14 @@
+@@ -166,16 +166,16 @@
                       mtl          >= 1.0 && < 1.2,
                       parsec       >= 2.0 && < 3.1,
                       html         == 1.0.*,
@@ -16,8 +16,11 @@ diff -ur --exclude=_darcs darcs-2.5/darcs.cabal darcs-2.5-ghc7/darcs.cabal
 -                     directory  == 1.0.*,
 +                     directory  >= 1.0.0.0 && < 1.2.0.0,
                       process    == 1.0.*,
-                      containers >= 0.1 && < 0.4,
+-                     containers >= 0.1 && < 0.4,
++                     containers >= 0.1 && < 0.5,
                       array      >= 0.1 && < 0.4,
+                      random     == 1.0.*,
+                      tar          == 0.3.*,
 @@ -368,7 +368,7 @@
                       mtl          >= 1.0 && < 1.2,
                       parsec       >= 2.0 && < 3.1,
@@ -27,15 +30,18 @@ diff -ur --exclude=_darcs darcs-2.5/darcs.cabal darcs-2.5-ghc7/darcs.cabal
                       haskeline    >= 0.6.2.2 && < 0.7,
                       hashed-storage >= 0.5.2 && < 0.6,
                       tar          == 0.3.*
-@@ -380,7 +380,7 @@
+@@ -380,9 +380,9 @@
                     bytestring >= 0.9.0 && < 0.10,
                     text >= 0.3,
                     old-time   == 1.0.*,
 -                   directory  == 1.0.*,
 +                   directory  >= 1.0.0.0 && < 1.2.0.0,
                     process    == 1.0.*,
-                    containers >= 0.1 && < 0.4,
+-                   containers >= 0.1 && < 0.4,
++                   containers >= 0.1 && < 0.5,
                     array      >= 0.1 && < 0.4,
+                    random     == 1.0.*
+ 
 @@ -509,7 +509,7 @@
                     mtl          >= 1.0 && < 1.2,
                     parsec       >= 2.0 && < 3.1,
@@ -45,15 +51,18 @@ diff -ur --exclude=_darcs darcs-2.5/darcs.cabal darcs-2.5-ghc7/darcs.cabal
                     haskeline    >= 0.6.2.2 && < 0.7,
                     hashed-storage >= 0.5.2 && < 0.6,
                     tar          == 0.3.*
-@@ -521,7 +521,7 @@
+@@ -521,9 +521,9 @@
                   bytestring >= 0.9.0 && < 0.10,
                   text >= 0.3,
                     old-time   == 1.0.*,
 -                   directory  == 1.0.*,
 +                   directory  >= 1.0.0.0 && < 1.2.0.0,
                     process    == 1.0.*,
-                    containers >= 0.1 && < 0.4,
+-                   containers >= 0.1 && < 0.4,
++                   containers >= 0.1 && < 0.5,
                     array      >= 0.1 && < 0.4,
+                    random     == 1.0.*
+ 
 @@ -597,7 +597,7 @@
                       mtl          >= 1.0 && < 1.2,
                       parsec       >= 2.0 && < 3.1,
@@ -63,15 +72,18 @@ diff -ur --exclude=_darcs darcs-2.5/darcs.cabal darcs-2.5-ghc7/darcs.cabal
                       QuickCheck   >= 2.1.0.0,
                       HUnit        >= 1.0,
                       test-framework             >= 0.2.2,
-@@ -659,7 +659,7 @@
+@@ -659,9 +659,9 @@
                     haskeline    >= 0.6.2.2 && < 0.7,
                     text >= 0.3,
                     old-time   == 1.0.*,
 -                   directory  == 1.0.*,
 +                   directory  >= 1.0.0.0 && < 1.2.0.0,
                     process    == 1.0.*,
-                    containers >= 0.1 && < 0.4,
+-                   containers >= 0.1 && < 0.4,
++                   containers >= 0.1 && < 0.5,
                     array      >= 0.1 && < 0.4,
+                    hashed-storage >= 0.5.2 && < 0.6,
+                    random     == 1.0.*
 diff -ur --exclude=_darcs darcs-2.5/src/Darcs/SelectChanges.hs darcs-2.5-ghc7/src/Darcs/SelectChanges.hs
 --- darcs-2.5/src/Darcs/SelectChanges.hs	2010-10-25 01:29:26.000000000 +1000
 +++ darcs-2.5-ghc7/src/Darcs/SelectChanges.hs	2010-11-26 19:39:43.000000000 +1000


More information about the scm-commits mailing list