[Pkg-haskell-commits] darcs: haskell-lens: New upstream version 3.8.5.
Clint Adams
clint at debian.org
Sat Feb 9 18:20:23 UTC 2013
Sat Feb 9 18:20:04 UTC 2013 Clint Adams <clint at debian.org>
* New upstream version 3.8.5.
Ignore-this: eedb6c075760fa83aee980ccf7e1c3ed
M ./changelog -1 +7
M ./control -61 +101
A ./patches/cope-with-bytestring-show-instance-change.diff
M ./patches/fix-doctest-path.hs -6 +4
M ./patches/fudge-doctest-nonascii.diff -11 +9
A ./patches/no-transformers-compat.diff
M ./patches/series +2
Sat Feb 9 18:20:04 UTC 2013 Clint Adams <clint at debian.org>
* New upstream version 3.8.5.
Ignore-this: eedb6c075760fa83aee980ccf7e1c3ed
diff -rN -u old-haskell-lens//changelog new-haskell-lens//changelog
--- old-haskell-lens//changelog 2013-02-09 18:20:23.375219749 +0000
+++ new-haskell-lens//changelog 2013-02-09 18:20:23.379847542 +0000
@@ -1,7 +1,13 @@
+haskell-lens (3.8.5-1) experimental; urgency=low
+
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Sat, 09 Feb 2013 12:36:35 -0500
+
haskell-lens (3.7.1.2-2) experimental; urgency=low
* Fix test suite dependencies (added missing test-framework-quickcheck2,
- removed not needed upper bounds)
+ removed not needed upper bounds)
-- Joachim Breitner <nomeata at debian.org> Fri, 01 Feb 2013 11:46:18 +0100
diff -rN -u old-haskell-lens//control new-haskell-lens//control
--- old-haskell-lens//control 2013-02-09 18:20:23.355919696 +0000
+++ new-haskell-lens//control 2013-02-09 18:20:23.383103777 +0000
@@ -4,68 +4,108 @@
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
Uploaders: Clint Adams <clint at debian.org>
Build-Depends: debhelper (>= 7.0)
- , haskell-devscripts (>= 0.8.13)
- , cdbs
- , ghc
- , ghc-prof
- , libghc-comonad-dev (>> 3.0)
- , libghc-comonad-dev (<< 3.1)
- , libghc-comonad-prof
- , libghc-comonad-transformers-dev (>> 3.0)
- , libghc-comonad-transformers-dev (<< 3.1)
- , libghc-comonad-transformers-prof
- , libghc-comonads-fd-dev (>> 3.0)
- , libghc-comonads-fd-dev (<< 3.1)
- , libghc-comonads-fd-prof
- , libghc-hashable-dev (>> 1.1.2.3)
- , libghc-hashable-dev (<< 1.3)
- , libghc-hashable-prof
- , libghc-mtl-dev (>> 2.0.1)
- , libghc-mtl-dev (<< 2.2)
- , libghc-mtl-prof
- , libghc-parallel-dev (>> 3.1.0.1)
- , libghc-parallel-dev (<< 3.3)
- , libghc-parallel-prof
- , libghc-semigroups-dev (>> 0.8.4)
- , libghc-semigroups-dev (<< 0.9)
- , libghc-semigroups-prof
- , libghc-split-dev (>> 0.2)
- , libghc-split-dev (<< 0.3)
- , libghc-split-prof
- , ghc-ghci
- , libghc-text-dev (>> 0.11)
- , libghc-text-dev (<< 0.12)
- , libghc-text-prof
- , libghc-transformers-dev (>> 0.3)
- , libghc-transformers-dev (<< 0.4)
- , libghc-transformers-prof
- , libghc-unordered-containers-dev (>> 0.2)
- , libghc-unordered-containers-dev (<< 0.3)
- , libghc-unordered-containers-prof
- , libghc-vector-dev (>> 0.9)
- , libghc-vector-dev (<< 0.11)
- , libghc-vector-prof
- , libghc-quickcheck2-dev (>> 2.4)
- , libghc-hunit-dev (>> 1.2)
- , libghc-test-framework-dev (>> 0.6)
- , libghc-test-framework-quickcheck2-dev (>> 0.2)
- , libghc-test-framework-hunit-dev (>> 0.2)
- , libghc-test-framework-th-dev (>> 0.2)
- , libghc-doctest-dev (>> 0.9.1)
- , libghc-simple-reflect-dev (>> 0.3.1)
+ , haskell-devscripts (>= 0.8.13)
+ , cdbs
+ , ghc
+ , ghc-prof
+ , libghc-bifunctors-dev (>> 3)
+ , libghc-bifunctors-dev (<< 4)
+ , libghc-bifunctors-prof
+ , libghc-comonad-dev (>> 3)
+ , libghc-comonad-dev (<< 4)
+ , libghc-comonad-prof
+ , libghc-comonad-transformers-dev (>> 3)
+ , libghc-comonad-transformers-dev (<< 4)
+ , libghc-comonad-transformers-prof
+ , libghc-comonads-fd-dev (>> 3)
+ , libghc-comonads-fd-dev (<< 4)
+ , libghc-comonads-fd-prof
+ , libghc-contravariant-dev (>> 0.2.0.2)
+ , libghc-contravariant-dev (<< 1)
+ , libghc-contravariant-prof
+ , libghc-distributive-dev (>> 0.3)
+ , libghc-distributive-dev (<< 1)
+ , libghc-distributive-prof
+ , libghc-generic-deriving-dev (>> 1.4)
+ , libghc-generic-deriving-dev (<< 1.5)
+ , libghc-generic-deriving-prof
+ , libghc-hashable-dev (>> 1.1.2.3)
+ , libghc-hashable-dev (<< 1.3)
+ , libghc-hashable-prof
+ , libghc-monadcatchio-transformers-dev (>> 0.3)
+ , libghc-monadcatchio-transformers-dev (<< 0.4)
+ , libghc-monadcatchio-transformers-prof
+ , libghc-mtl-dev (>> 2.0.1)
+ , libghc-mtl-dev (<< 2.2)
+ , libghc-mtl-prof
+ , libghc-parallel-dev (>> 3.1.0.1)
+ , libghc-parallel-dev (<< 3.3)
+ , libghc-parallel-prof
+ , libghc-profunctor-extras-dev (>> 3.3)
+ , libghc-profunctor-extras-dev (<< 4)
+ , libghc-profunctor-extras-prof
+ , libghc-profunctors-dev (>> 3.2)
+ , libghc-profunctors-dev (<< 4)
+ , libghc-profunctors-prof
+ , libghc-reflection-dev (>> 1.1.6)
+ , libghc-reflection-dev (<< 2)
+ , libghc-reflection-prof
+ , libghc-semigroupoids-dev (>> 3)
+ , libghc-semigroupoids-dev (<< 4)
+ , libghc-semigroupoids-prof
+ , libghc-semigroups-dev (>> 0.8.4)
+ , libghc-semigroups-dev (<< 1)
+ , libghc-semigroups-prof
+ , libghc-split-dev (>> 0.2)
+ , libghc-split-dev (<< 0.3)
+ , libghc-split-prof
+ , libghc-tagged-dev (>> 0.4.4)
+ , libghc-tagged-dev (<< 1)
+ , libghc-tagged-prof
+ , ghc-ghci
+ , libghc-text-dev (>> 0.11)
+ , libghc-text-dev (<< 0.12)
+ , libghc-text-prof
+ , libghc-transformers-dev (>> 0.3)
+ , libghc-transformers-dev (<< 0.4)
+ , libghc-transformers-prof
+ , libghc-unordered-containers-dev (>> 0.2)
+ , libghc-unordered-containers-dev (<< 0.3)
+ , libghc-unordered-containers-prof
+ , libghc-vector-dev (>> 0.9)
+ , libghc-vector-dev (<< 0.11)
+ , libghc-vector-prof
+ , libghc-quickcheck2-dev (>> 2.4)
+ , libghc-hunit-dev (>> 1.2)
+ , libghc-test-framework-dev (>> 0.6)
+ , libghc-test-framework-quickcheck2-dev (>> 0.2)
+ , libghc-test-framework-hunit-dev (>> 0.2)
+ , libghc-test-framework-th-dev (>> 0.2)
+ , libghc-doctest-dev (>> 0.9.1)
+ , libghc-simple-reflect-dev (>> 0.3.1)
Build-Depends-Indep: ghc-doc
- , libghc-comonad-doc
- , libghc-comonad-transformers-doc
- , libghc-comonads-fd-doc
- , libghc-hashable-doc
- , libghc-mtl-doc
- , libghc-parallel-doc
- , libghc-semigroups-doc
- , libghc-split-doc
- , libghc-text-doc
- , libghc-transformers-doc
- , libghc-unordered-containers-doc
- , libghc-vector-doc
+ , libghc-bifunctors-doc
+ , libghc-comonad-doc
+ , libghc-comonad-transformers-doc
+ , libghc-comonads-fd-doc
+ , libghc-contravariant-doc
+ , libghc-distributive-doc
+ , libghc-generic-deriving-doc
+ , libghc-hashable-doc
+ , libghc-monadcatchio-transformers-doc
+ , libghc-mtl-doc
+ , libghc-parallel-doc
+ , libghc-profunctor-extras-doc
+ , libghc-profunctors-doc
+ , libghc-reflection-doc
+ , libghc-semigroupoids-doc
+ , libghc-semigroups-doc
+ , libghc-split-doc
+ , libghc-tagged-doc
+ , libghc-text-doc
+ , libghc-transformers-doc
+ , libghc-unordered-containers-doc
+ , libghc-vector-doc
Standards-Version: 3.9.4
Homepage: http://github.com/ekmett/lens/
diff -rN -u old-haskell-lens//patches/cope-with-bytestring-show-instance-change.diff new-haskell-lens//patches/cope-with-bytestring-show-instance-change.diff
--- old-haskell-lens//patches/cope-with-bytestring-show-instance-change.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-lens//patches/cope-with-bytestring-show-instance-change.diff 2013-02-09 18:20:23.383103777 +0000
@@ -0,0 +1,13 @@
+Index: lens-3.8.5/src/Data/ByteString/Lazy/Lens.hs
+===================================================================
+--- lens-3.8.5.orig/src/Data/ByteString/Lazy/Lens.hs 2013-01-26 14:22:29.000000000 +0000
++++ lens-3.8.5/src/Data/ByteString/Lazy/Lens.hs 2013-02-09 18:02:50.650439784 +0000
+@@ -35,7 +35,7 @@
+ -- @
+ --
+ -- >>> [104,101,108,108,111]^.packedBytes
+--- Chunk "hello" Empty
++-- "hello"
+ packedBytes :: Iso' [Word8] ByteString
+ packedBytes = iso Words.pack unpackLazy
+ {-# INLINE packedBytes #-}
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-02-09 18:20:23.339918250 +0000
+++ new-haskell-lens//patches/fix-doctest-path.hs 2013-02-09 18:20:23.383103777 +0000
@@ -1,10 +1,8 @@
-Index: lens-3.7.1.2/tests/doctests.hs
-===================================================================
---- 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 @@
+--- a/tests/doctests.hsc
++++ b/tests/doctests.hsc
+@@ -52,9 +52,9 @@
main :: IO ()
- main = getSources >>= \sources -> doctest $
+ main = withUnicode $ getSources >>= \sources -> doctest $
"-isrc"
- : "-idist/build/autogen"
+ : "-idist-ghc/build/autogen"
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 2013-02-09 18:20:23.334320464 +0000
+++ new-haskell-lens//patches/fudge-doctest-nonascii.diff 2013-02-09 18:20:23.383103777 +0000
@@ -1,31 +1,29 @@
-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 @@
+--- a/src/Data/Complex/Lens.hs
++++ b/src/Data/Complex/Lens.hs
+@@ -30,7 +30,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
+ -- | Access the 'realPart' of a 'Complex' number.
--
-@@ -102,7 +102,7 @@
+@@ -104,7 +104,7 @@
- -- | Access the 'phase' of a 'Complex' number
+ -- | 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 @@
+ -- This isn't /quite/ a legal 'Lens'. Notably the
+@@ -126,7 +126,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 :: RealFloat a => Iso' (Complex a) (Complex a)
_conjugate = iso conjugate conjugate
diff -rN -u old-haskell-lens//patches/no-transformers-compat.diff new-haskell-lens//patches/no-transformers-compat.diff
--- old-haskell-lens//patches/no-transformers-compat.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-lens//patches/no-transformers-compat.diff 2013-02-09 18:20:23.387722598 +0000
@@ -0,0 +1,10 @@
+--- a/lens.cabal
++++ b/lens.cabal
+@@ -187,7 +187,6 @@
+ template-haskell >= 2.4 && < 2.10,
+ text >= 0.11 && < 0.12,
+ transformers >= 0.2 && < 0.4,
+- transformers-compat >= 0.1 && < 1,
+ unordered-containers >= 0.2 && < 0.3,
+ vector >= 0.9 && < 0.11
+
diff -rN -u old-haskell-lens//patches/series new-haskell-lens//patches/series
--- old-haskell-lens//patches/series 2013-02-09 18:20:23.294250073 +0000
+++ new-haskell-lens//patches/series 2013-02-09 18:20:23.387722598 +0000
@@ -1,2 +1,4 @@
fix-doctest-path.hs
fudge-doctest-nonascii.diff
+no-transformers-compat.diff
+cope-with-bytestring-show-instance-change.diff
More information about the Pkg-haskell-commits
mailing list