[Pkg-haskell-commits] darcs: haskell-lens: New upstream release
Joachim Breitner
mail at joachim-breitner.de
Mon Dec 22 14:30:02 UTC 2014
Sun Dec 21 23:11:34 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* New upstream release
M ./changelog -2 +3
M ./control -28 +8
R ./patches/quickcheck-2.7-compat
R ./patches/semigroupoids-4.2
M ./patches/series -2
Sun Dec 21 23:11:34 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* New upstream release
diff -rN -u old-haskell-lens/changelog new-haskell-lens/changelog
--- old-haskell-lens/changelog 2014-12-22 14:30:02.197348805 +0000
+++ new-haskell-lens/changelog 2014-12-22 14:30:02.205348812 +0000
@@ -1,8 +1,9 @@
-haskell-lens (4.1.2.1-4) UNRELEASED; urgency=medium
+haskell-lens (4.6.0.1-1) UNRELEASED; urgency=medium
* Depend on haskell-devscripts 0.9, found in experimental
+ * New upstream release
- -- Joachim Breitner <nomeata at debian.org> Sat, 20 Dec 2014 16:57:54 +0100
+ -- Joachim Breitner <nomeata at debian.org> Sat, 20 Dec 2014 17:03:29 +0100
haskell-lens (4.1.2.1-3) unstable; urgency=medium
diff -rN -u old-haskell-lens/control new-haskell-lens/control
--- old-haskell-lens/control 2014-12-22 14:30:02.197348805 +0000
+++ new-haskell-lens/control 2014-12-22 14:30:02.205348812 +0000
@@ -8,9 +8,6 @@
, cdbs
, ghc
, ghc-prof
- , libghc-aeson-dev (>= 0.7)
- , libghc-aeson-dev (<< 0.8)
- , libghc-aeson-prof
, libghc-bifunctors-dev (>> 4)
, libghc-bifunctors-dev (<< 5)
, libghc-bifunctors-prof
@@ -18,25 +15,22 @@
, libghc-comonad-dev (<< 5)
, libghc-comonad-prof
, libghc-contravariant-dev (>> 0.3)
- , libghc-contravariant-dev (<< 1)
+ , libghc-contravariant-dev (<< 2)
, libghc-contravariant-prof
, libghc-distributive-dev (>> 0.3)
, libghc-distributive-dev (<< 1)
, libghc-distributive-prof
- , libghc-exceptions-dev (>= 0.1.1)
- , libghc-exceptions-dev (<< 1)
- , libghc-exceptions-prof
, libghc-free-dev (>= 4)
, libghc-free-dev (<< 5)
, libghc-free-prof
- , libghc-generic-deriving-dev (>> 1.4) [any-amd64 any-i386 powerpc sparc]
- , libghc-generic-deriving-dev (<< 1.7) [any-amd64 any-i386 powerpc sparc]
- , libghc-generic-deriving-prof [any-amd64 any-i386 powerpc sparc]
, libghc-hashable-dev (>> 1.1.2.3)
, libghc-hashable-dev (<< 1.3)
, libghc-hashable-prof
+ , libghc-exceptions-dev (>= 0.1.1)
+ , libghc-exceptions-dev (<< 1)
+ , libghc-exceptions-prof
, libghc-mtl-dev (>> 2.0.1)
- , libghc-mtl-dev (<< 2.2)
+ , libghc-mtl-dev (<< 2.3)
, libghc-mtl-prof
, libghc-parallel-dev (>> 3.1.0.1)
, libghc-parallel-dev (<< 3.3)
@@ -50,9 +44,6 @@
, libghc-reflection-dev (>> 1.1.6)
, libghc-reflection-dev (<< 2)
, libghc-reflection-prof
- , libghc-scientific-dev (>= 0.2)
- , libghc-scientific-dev (<< 0.4)
- , libghc-scientific-prof
, libghc-semigroupoids-dev (>= 4)
, libghc-semigroupoids-dev (<< 5)
, libghc-semigroupoids-prof
@@ -66,26 +57,19 @@
, libghc-tagged-dev (<< 1)
, libghc-tagged-prof
, libghc-text-dev (>> 0.11)
- , libghc-text-dev (<< 1.2)
+ , libghc-text-dev (<< 1.3)
, 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-utf8-string-dev (>= 0.3.7)
- , libghc-utf8-string-dev (<< 0.4)
- , libghc-utf8-string-prof
, libghc-vector-dev (>> 0.9)
, libghc-vector-dev (<< 0.11)
, libghc-vector-prof
, libghc-void-dev (>> 0.5)
, libghc-void-dev (<< 1)
, libghc-void-prof
- , libghc-zlib-dev (>= 0.5.4)
- , libghc-zlib-dev (<< 0.6)
- , libghc-zlib-prof
+# for the test suite
+ , libghc-generic-deriving-dev
, libghc-quickcheck2-dev (>> 2.4)
, libghc-hunit-dev (>> 1.2)
, libghc-test-framework-dev (>> 0.6)
@@ -95,7 +79,6 @@
, libghc-doctest-dev (>> 0.9.1)
, libghc-simple-reflect-dev (>> 0.3.1)
Build-Depends-Indep: ghc-doc
- , libghc-aeson-doc
, libghc-bifunctors-doc
, libghc-comonad-doc
, libghc-contravariant-doc
@@ -110,15 +93,12 @@
, libghc-primitive-doc
, libghc-profunctors-doc
, libghc-reflection-doc
- , libghc-scientific-doc
, libghc-semigroupoids-doc
, libghc-semigroups-doc
, libghc-split-doc
, libghc-tagged-doc
, libghc-text-doc
- , libghc-transformers-doc
, libghc-unordered-containers-doc
- , libghc-utf8-string-doc
, libghc-vector-doc
, libghc-void-doc
, libghc-zlib-doc
diff -rN -u old-haskell-lens/patches/quickcheck-2.7-compat new-haskell-lens/patches/quickcheck-2.7-compat
--- old-haskell-lens/patches/quickcheck-2.7-compat 2014-12-22 14:30:02.193348801 +0000
+++ new-haskell-lens/patches/quickcheck-2.7-compat 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-Index: haskell-lens-4.1.2.1/lens-properties/src/Control/Lens/Properties.hs
-===================================================================
---- haskell-lens-4.1.2.1.orig/lens-properties/src/Control/Lens/Properties.hs 2014-05-16 19:17:35.000000000 +0200
-+++ haskell-lens-4.1.2.1/lens-properties/src/Control/Lens/Properties.hs 2014-08-02 11:13:41.898140422 +0200
-@@ -44,8 +44,8 @@
- .&. do as <- arbitrary
- bs <- arbitrary
- t <- arbitrary
-- property $ traverse_compose l (\x -> as++[x]++bs)
-- (\x -> if t then Just x else Nothing)
-+ return $ traverse_compose l (\x -> as++[x]++bs)
-+ (\x -> if t then Just x else Nothing)
-
-
- --------------------------------------------------------------------------------
-Index: haskell-lens-4.1.2.1/src/Data/Aeson/Lens.hs
-===================================================================
---- haskell-lens-4.1.2.1.orig/src/Data/Aeson/Lens.hs 2014-08-02 11:22:48.690121006 +0200
-+++ haskell-lens-4.1.2.1/src/Data/Aeson/Lens.hs 2014-08-02 11:22:59.310120629 +0200
-@@ -215,7 +215,7 @@
- -- Just (String "xyz")
- --
- -- >>> "{\"a\": {}, \"b\": null}" ^? key "a" . nonNull
---- Just (Object fromList [])
-+-- Just (Object (fromList []))
- --
- -- >>> "{\"a\": \"xyz\", \"b\": null}" ^? key "b" . nonNull
- -- Nothing
-@@ -235,7 +235,7 @@
-
- -- |
- -- >>> "{\"a\": {}, \"b\": null}" ^? key "a" . _Object
-- -- Just fromList []
-+ -- Just (fromList [])
- --
- -- >>> "{\"a\": {}, \"b\": null}" ^? key "b" . _Object
- -- Nothing
diff -rN -u old-haskell-lens/patches/semigroupoids-4.2 new-haskell-lens/patches/semigroupoids-4.2
--- old-haskell-lens/patches/semigroupoids-4.2 2014-12-22 14:30:02.193348801 +0000
+++ new-haskell-lens/patches/semigroupoids-4.2 1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-From b569dbd963b4d7bb8f14bc04f6cb72e4bd93227c Mon Sep 17 00:00:00 2001
-From: EdwardKmett <>
-Date: Thu, 31 Jul 2014 03:08:00 +0200
-Subject: version 4.3.3
-
-
-diff --git a/src/Control/Lens/Internal/Instances.hs b/src/Control/Lens/Internal/Instances.hs
-index 16aa51c..b109b1e 100644
---- a/src/Control/Lens/Internal/Instances.hs
-+++ b/src/Control/Lens/Internal/Instances.hs
-@@ -4,6 +4,10 @@
- #ifndef MIN_VERSION_base
- #define MIN_VERSION_base(x,y,z) 1
- #endif
-+
-+#ifndef MIN_VERSION_semigroupoids
-+#define MIN_VERSION_semigroupoids(x,y,z) 1
-+#endif
- -----------------------------------------------------------------------------
- -- |
- -- Module : Control.Lens.Internal.Instances
-@@ -14,14 +18,19 @@
- -- Portability : non-portable
- --
- -- This module includes orphan instances for @(,)@, 'Either' and 'Const' that
---- should be supplied by base.
-+-- should be supplied by base. These have moved to @semigroupoids@ as of 4.2.
- ----------------------------------------------------------------------------
- module Control.Lens.Internal.Instances () where
-
-+import Data.Traversable.Instances ()
-+
-+#if !(MIN_VERSION_semigroupoids(0,4,2))
-+
- import Control.Applicative
- import Data.Semigroup.Foldable
- import Data.Semigroup.Traversable
-
-+
- #if !(MIN_VERSION_base(4,7,0))
- import Data.Monoid
- import Data.Foldable
-@@ -60,3 +69,4 @@ instance Foldable1 ((,) b) where
- instance Traversable1 ((,) b) where
- traverse1 f (b, a) = (,) b <$> f a
-
-+#endif
---
-cgit v0.10.2
-
diff -rN -u old-haskell-lens/patches/series new-haskell-lens/patches/series
--- old-haskell-lens/patches/series 2014-12-22 14:30:02.193348801 +0000
+++ new-haskell-lens/patches/series 2014-12-22 14:30:02.205348812 +0000
@@ -4,5 +4,3 @@
fix-doctest-path.hs
fudge-doctest-nonascii.diff
backport-testsuite-failure-fix.patch
-quickcheck-2.7-compat
-semigroupoids-4.2
More information about the Pkg-haskell-commits
mailing list