[Pkg-haskell-commits] darcs: haskell-lens: New upstream version 3.7.1.2.

[Clint Adams]

Tue Jan  1 22:51:07 UTC 2013  Clint Adams <clint at debian.org>
  * New upstream version 3.7.1.2.
  Ignore-this: 6728c602934577b5a3ff553a49d2ef7

    M ./changelog +6
    M ./control -3 +4
    M ./patches/fix-doctest-path.hs -6 +6
    A ./patches/fudge-doctest-nonascii.diff
    M ./patches/series +1

Tue Jan  1 22:51:07 UTC 2013  Clint Adams <clint at debian.org>
  * New upstream version 3.7.1.2.
  Ignore-this: 6728c602934577b5a3ff553a49d2ef7
diff -rN -u old-haskell-lens//changelog new-haskell-lens//changelog
--- old-haskell-lens//changelog	2013-01-01 22:51:26.926235137 +0000
+++ new-haskell-lens//changelog	2013-01-01 22:51:26.930234539 +0000
@@ -1,3 +1,9 @@
+haskell-lens (3.7.1.2-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Mon, 31 Dec 2012 17:31:04 -0500
+
 haskell-lens (3.6-1) experimental; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-lens//control new-haskell-lens//control
--- old-haskell-lens//control	2013-01-01 22:51:26.922233864 +0000
+++ new-haskell-lens//control	2013-01-01 22:51:26.930234539 +0000
@@ -17,10 +17,10 @@
              , libghc-comonads-fd-dev (>> 3.0)
              , libghc-comonads-fd-dev (<< 3.1)
              , libghc-comonads-fd-prof
-             , libghc-hashable-dev (>> 1.1)
-             , libghc-hashable-dev (<< 1.2)
+             , libghc-hashable-dev (>> 1.1.2.3)
+             , libghc-hashable-dev (<< 1.3)
              , libghc-hashable-prof
-             , libghc-mtl-dev (>> 2.1.1)
+             , libghc-mtl-dev (>> 2.0.1)
              , libghc-mtl-dev (<< 2.2)
              , libghc-mtl-prof
              , libghc-parallel-dev (>> 3.1.0.1)
@@ -57,6 +57,7 @@
              , libghc-test-framework-th-dev (<< 0.3)
              , libghc-doctest-dev (>> 0.9.1)
              , libghc-doctest-dev (<< 0.10.1)
+             , libghc-simple-reflect-dev (>> 0.3.1)
 Build-Depends-Indep: ghc-doc
                    , libghc-comonad-doc
                    , libghc-comonad-transformers-doc
diff -rN -u old-haskell-lens//patches/fix-doctest-path.hs new-haskell-lens//patches/fix-doctest-path.hs
--- old-haskell-lens//patches/fix-doctest-path.hs	2013-01-01 22:51:26.886233945 +0000
+++ new-haskell-lens//patches/fix-doctest-path.hs	2013-01-01 22:51:26.934230027 +0000
@@ -1,8 +1,8 @@
-Index: lens-3.0.5/tests/doctests.hs
+Index: lens-3.7.1.2/tests/doctests.hs
 ===================================================================
---- lens-3.0.5.orig/tests/doctests.hs	2012-10-29 20:42:42.226273057 +0000
-+++ lens-3.0.5/tests/doctests.hs	2012-10-29 20:43:29.318137661 +0000
-@@ -10,9 +10,9 @@
+--- lens-3.7.1.2.orig/tests/doctests.hs	2013-01-01 22:22:52.236614171 +0000
++++ lens-3.7.1.2/tests/doctests.hs	2013-01-01 22:23:24.524573289 +0000
+@@ -11,9 +11,9 @@
  main :: IO ()
  main = getSources >>= \sources -> doctest $
      "-isrc"
@@ -11,6 +11,6 @@
    : "-optP-include"
 -  : "-optPdist/build/autogen/cabal_macros.h"
 +  : "-optPdist-ghc/build/autogen/cabal_macros.h"
-   : sources
+   : "-hide-all-packages"
+   : map ("-package="++) deps ++ sources
  
- getSources :: IO [FilePath]
diff -rN -u old-haskell-lens//patches/fudge-doctest-nonascii.diff new-haskell-lens//patches/fudge-doctest-nonascii.diff
--- old-haskell-lens//patches/fudge-doctest-nonascii.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-lens//patches/fudge-doctest-nonascii.diff	2013-01-01 22:51:26.934230027 +0000
@@ -0,0 +1,31 @@
+Index: lens-3.7.1.2/src/Data/Complex/Lens.hs
+===================================================================
+--- lens-3.7.1.2.orig/src/Data/Complex/Lens.hs	2013-01-01 22:43:28.000000000 +0000
++++ lens-3.7.1.2/src/Data/Complex/Lens.hs	2013-01-01 22:45:08.230678712 +0000
+@@ -32,7 +32,7 @@
+ 
+ -- $setup
+ -- >>> import Debug.SimpleReflect
+--- >>> let { a ≈ b = abs (a - b) < 1e-6; infix 4 ≈ }
++-- >>> let { a ~~ b = abs (a - b) < 1e-6; infix 4 ~~ }
+ 
+ -- | Access the 'realPart' of a 'Complex' number
+ --
+@@ -102,7 +102,7 @@
+ 
+ -- | Access the 'phase' of a 'Complex' number
+ --
+--- >>> (mkPolar 10 (2-pi) & _phase +~ pi & view _phase) ≈ 2
++-- >>> (mkPolar 10 (2-pi) & _phase +~ pi & view _phase) ~~ 2
+ -- True
+ --
+ -- This isn't /quite/ a legal lens. Notably the
+@@ -123,7 +123,7 @@
+ -- >>> (2.0 :+ 3.0) & _conjugate . _imagPart -~ 1
+ -- 2.0 :+ 4.0
+ --
+--- >>> (mkPolar 10.0 2.0 ^. _conjugate . _phase) ≈ (-2.0)
++-- >>> (mkPolar 10.0 2.0 ^. _conjugate . _phase) ~~ (-2.0)
+ -- True
+ _conjugate :: RealFloat a => Simple Iso (Complex a) (Complex a)
+ _conjugate = iso conjugate conjugate
diff -rN -u old-haskell-lens//patches/series new-haskell-lens//patches/series
--- old-haskell-lens//patches/series	2013-01-01 22:51:26.854266061 +0000
+++ new-haskell-lens//patches/series	2013-01-01 22:51:26.934230027 +0000
@@ -1 +1,2 @@
 fix-doctest-path.hs
+fudge-doctest-nonascii.diff