[Pkg-haskell-commits] darcs: haskell-lens: Replace disable-unreliable-test.diff with the proper upstream fix.

[Colin Watson]

Mon Jun 17 20:43:36 UTC 2013  Colin Watson <cjwatson at debian.org>
  * Replace disable-unreliable-test.diff with the proper upstream fix.

    M ./changelog -2 +2
    R ./patches/disable-unreliable-test.diff
    A ./patches/fix-doctest-float-implementations.diff
    M ./patches/series -1 +1

Mon Jun 17 20:43:36 UTC 2013  Colin Watson <cjwatson at debian.org>
  * Replace disable-unreliable-test.diff with the proper upstream fix.
diff -rN -u old-haskell-lens/changelog new-haskell-lens/changelog
--- old-haskell-lens/changelog	2013-06-17 20:43:41.317540924 +0000
+++ new-haskell-lens/changelog	2013-06-17 20:43:41.317540924 +0000
@@ -1,7 +1,7 @@
 haskell-lens (3.9.0.2-3) UNRELEASED; urgency=low
 
-  * Disable an unreliable test that fails on hurd-i386 and kfreebsd-i386 due
-    to slight differences in floating-point representation.
+  * Backport from upstream:
+    - Control.Lens.Setter: Fix doctest with different float implementations.
   * Disable the hunit and properties test suites on sparc, since they
     require SMP support via the RTS -N option.
 
diff -rN -u old-haskell-lens/patches/disable-unreliable-test.diff new-haskell-lens/patches/disable-unreliable-test.diff
--- old-haskell-lens/patches/disable-unreliable-test.diff	2013-06-17 20:43:41.317540924 +0000
+++ new-haskell-lens/patches/disable-unreliable-test.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-Description: Disable an unreliable test
- This test is currently unreliable due to slight differences in
- floating-point representation (https://github.com/ekmett/lens/issues/310),
- and fails on hurd-i386 and kfreebsd-i386 in a way that does not indicate a
- problem with the **~ operator itself.  This patch may be dropped once the
- test is fixed.
-Author: Colin Watson <cjwatson at debian.org>
-Forwarded: no
-Last-Update: 2013-06-17
-
-Index: b/src/Control/Lens/Setter.hs
-===================================================================
---- a/src/Control/Lens/Setter.hs
-+++ b/src/Control/Lens/Setter.hs
-@@ -669,9 +669,6 @@
- -- >>> (a,b) & both **~ c
- -- (a**c,b**c)
- --
---- >>> _2 **~ pi $ (1,3)
---- (1,31.54428070019754)
----
- -- @
- -- ('**~') :: 'Floating' a => 'Setter'' s a    -> a -> s -> s
- -- ('**~') :: 'Floating' a => 'Iso'' s a       -> a -> s -> s
diff -rN -u old-haskell-lens/patches/fix-doctest-float-implementations.diff new-haskell-lens/patches/fix-doctest-float-implementations.diff
--- old-haskell-lens/patches/fix-doctest-float-implementations.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-lens/patches/fix-doctest-float-implementations.diff	2013-06-17 20:43:41.321541925 +0000
@@ -0,0 +1,22 @@
+Description: Fix doctest with different float implementations
+Author: Johan Kiviniemi <devel at johan.kiviniemi.name>
+Origin: upstream, https://github.com/ekmett/lens/commit/ab2c8ee732ef09f713730ee8f431ef2f53535c3f
+Bug: https://github.com/ekmett/lens/issues/310
+Forwarded: not-needed
+Last-Update: 2013-06-17
+
+Index: b/src/Control/Lens/Setter.hs
+===================================================================
+--- a/src/Control/Lens/Setter.hs
++++ b/src/Control/Lens/Setter.hs
+@@ -669,8 +669,8 @@
+ -- >>> (a,b) & both **~ c
+ -- (a**c,b**c)
+ --
+--- >>> _2 **~ pi $ (1,3)
+--- (1,31.54428070019754)
++-- >>> _2 **~ 10 $ (3,2)
++-- (3,1024.0)
+ --
+ -- @
+ -- ('**~') :: 'Floating' a => 'Setter'' s a    -> a -> s -> s
diff -rN -u old-haskell-lens/patches/series new-haskell-lens/patches/series
--- old-haskell-lens/patches/series	2013-06-17 20:43:41.313541802 +0000
+++ new-haskell-lens/patches/series	2013-06-17 20:43:41.325540640 +0000
@@ -1,4 +1,4 @@
 fix-doctest-path.hs
 fudge-doctest-nonascii.diff
 no-transformers-compat.diff
-disable-unreliable-test.diff
+fix-doctest-float-implementations.diff