[Pkg-haskell-commits] darcs: haskell-cond: Merge changes

[Joachim Breitner]

Sat Dec  1 22:29:33 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Merge changes
  Ignore-this: 2bf6b483663d45b134acb702fbdc58be

    M ./changelog -3 +9
    R ./patches/
    R ./patches/num-constraint.diff
    R ./patches/series

Sat Dec  1 22:29:33 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Merge changes
  Ignore-this: 2bf6b483663d45b134acb702fbdc58be
diff -rN -u old-haskell-cond//changelog new-haskell-cond//changelog
--- old-haskell-cond//changelog	2012-12-01 22:29:55.591220185 +0000
+++ new-haskell-cond//changelog	2012-12-01 22:29:55.595224138 +0000
@@ -1,12 +1,18 @@
-haskell-cond (0.4.0.1-2) UNRELEASED; urgency=low
+haskell-cond (0.4.0.2-1) experimental; urgency=low
 
-  [ Joachim Breitner ]
   * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
     against experimental
   * Bump standards version, no change
   * New upstream release
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 13 Oct 2012 14:08:15 +0200
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 01 Dec 2012 23:23:40 +0100
+
+haskell-cond (0.4.0.1-2) experimental; urgency=low
+
+  [ Clint Adams ]
+  * Patch to build with GHC 7.6.
+
+ -- Clint Adams <clint at debian.org>  Tue, 27 Nov 2012 05:46:43 +0000
 
 haskell-cond (0.4.0.1-1) unstable; urgency=low
 
diff -rN -u old-haskell-cond//patches/num-constraint.diff new-haskell-cond//patches/num-constraint.diff
--- old-haskell-cond//patches/num-constraint.diff	2012-12-01 22:29:55.591220185 +0000
+++ new-haskell-cond//patches/num-constraint.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Index: haskell-cond-0.4.0.1/src/Data/Algebra/Boolean.hs
-===================================================================
---- haskell-cond-0.4.0.1.orig/src/Data/Algebra/Boolean.hs	2012-05-30 20:13:52.000000000 +0000
-+++ haskell-cond-0.4.0.1/src/Data/Algebra/Boolean.hs	2012-11-27 05:47:42.370425585 +0000
-@@ -120,7 +120,7 @@
-                   deriving (Num, Bits, Eq, Ord, Bounded, Enum, Show, Read, Real,
-                             Integral, Typeable, Data, Ix, Storable, PrintfArg)
- 
--instance Bits a => Boolean (Bitwise a) where
-+instance (Bits a, Num a) => Boolean (Bitwise a) where
-   true   = not false 
-   false  = Bitwise 0 
-   not    = Bitwise . complement . getBits
diff -rN -u old-haskell-cond//patches/series new-haskell-cond//patches/series
--- old-haskell-cond//patches/series	2012-12-01 22:29:55.591220185 +0000
+++ new-haskell-cond//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-num-constraint.diff