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

Clint Adams clint at debian.org
Sun Nov 10 02:50:07 UTC 2013


Sun Nov 10 02:49:48 UTC 2013  Clint Adams <clint at debian.org>
  * New upstream version 3.10.

    M ./changelog +6
    M ./control -21 +9
    M ./patches/add-without-th-flag.patch -22 +14
    M ./patches/fix-doctest-float-implementations.diff -3 +1
    M ./patches/guard-ANNotations.patch -46 +15

Sun Nov 10 02:49:48 UTC 2013  Clint Adams <clint at debian.org>
  * New upstream version 3.10.
diff -rN -u old-haskell-lens/changelog new-haskell-lens/changelog
--- old-haskell-lens/changelog	2013-11-10 02:50:07.770543711 +0000
+++ new-haskell-lens/changelog	2013-11-10 02:50:07.774556057 +0000
@@ -1,3 +1,9 @@
+haskell-lens (3.10-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Sat, 09 Nov 2013 21:25:25 -0500
+
 haskell-lens (3.9.0.2-4) unstable; urgency=low
 
   * Adjust watch file to new hackage layout
diff -rN -u old-haskell-lens/control new-haskell-lens/control
--- old-haskell-lens/control	2013-11-10 02:50:07.770543711 +0000
+++ new-haskell-lens/control	2013-11-10 02:50:07.774556057 +0000
@@ -8,18 +8,12 @@
  , cdbs
  , ghc
  , ghc-prof
- , libghc-bifunctors-dev (>> 3)
- , libghc-bifunctors-dev (<< 4)
+ , libghc-bifunctors-dev (>> 4)
+ , libghc-bifunctors-dev (<< 5)
  , libghc-bifunctors-prof
- , libghc-comonad-dev (>> 3)
- , libghc-comonad-dev (<< 4)
+ , libghc-comonad-dev (>= 4)
+ , libghc-comonad-dev (<< 5)
  , 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.3)
  , libghc-contravariant-dev (<< 1)
  , libghc-contravariant-prof
@@ -27,7 +21,7 @@
  , libghc-distributive-dev (<< 1)
  , libghc-distributive-prof
  , libghc-generic-deriving-dev (>> 1.4) [!armel !armhf !mips !mipsel !s390 !s390x]
- , libghc-generic-deriving-dev (<< 1.6) [!armel !armhf !mips !mipsel !s390 !s390x]
+ , libghc-generic-deriving-dev (<< 1.7) [!armel !armhf !mips !mipsel !s390 !s390x]
  , libghc-generic-deriving-prof [!armel !armhf !mips !mipsel !s390 !s390x]
  , libghc-hashable-dev (>> 1.1.2.3)
  , libghc-hashable-dev (<< 1.3)
@@ -41,17 +35,14 @@
  , 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-dev (>= 4)
+ , libghc-profunctors-dev (<< 5)
  , libghc-profunctors-prof
  , libghc-reflection-dev (>> 1.1.6) [!armel !armhf !mips !mipsel !s390 !s390x]
  , libghc-reflection-dev (<< 2) [!armel !armhf !mips !mipsel !s390 !s390x]
  , libghc-reflection-prof [!armel !armhf !mips !mipsel !s390 !s390x]
- , libghc-semigroupoids-dev (>> 3.0.2)
- , libghc-semigroupoids-dev (<< 4)
+ , libghc-semigroupoids-dev (>= 4)
+ , libghc-semigroupoids-dev (<< 5)
  , libghc-semigroupoids-prof
  , libghc-semigroups-dev (>> 0.8.4)
  , libghc-semigroups-dev (<< 1)
@@ -88,8 +79,6 @@
 Build-Depends-Indep: ghc-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
@@ -97,7 +86,6 @@
  , libghc-monadcatchio-transformers-doc
  , libghc-mtl-doc
  , libghc-parallel-doc
- , libghc-profunctor-extras-doc
  , libghc-profunctors-doc
  , libghc-reflection-doc
  , libghc-semigroupoids-doc
diff -rN -u old-haskell-lens/patches/add-without-th-flag.patch new-haskell-lens/patches/add-without-th-flag.patch
--- old-haskell-lens/patches/add-without-th-flag.patch	2013-11-10 02:50:07.686543800 +0000
+++ new-haskell-lens/patches/add-without-th-flag.patch	2013-11-10 02:50:07.777793893 +0000
@@ -8,11 +8,9 @@
  src/Control/Lens/Internal/Exception.hs |  6 ++++++
  2 files changed, 27 insertions(+), 7 deletions(-)
 
-diff --git a/lens.cabal b/lens.cabal
-index 8714cdd..7c31cab 100644
 --- a/lens.cabal
 +++ b/lens.cabal
-@@ -133,6 +133,11 @@ flag dump-splices
+@@ -133,6 +133,11 @@
    default: False
    manual: True
  
@@ -24,23 +22,22 @@
  -- You can disable the doctests test suite with -f-test-doctests
  flag test-doctests
    default: True
-@@ -175,7 +180,6 @@ library
+@@ -173,14 +178,12 @@
      containers                >= 0.4.0    && < 0.6,
      distributive              >= 0.3      && < 1,
      filepath                  >= 1.2.0.0  && < 1.4,
--    generic-deriving          >= 1.4      && < 1.6,
+-    generic-deriving          >= 1.4      && < 1.7,
      ghc-prim,
      hashable                  >= 1.1.2.3  && < 1.3,
      MonadCatchIO-transformers >= 0.3      && < 0.4,
-@@ -183,7 +187,6 @@ library
+     mtl                       >= 2.0.1    && < 2.2,
      parallel                  >= 3.1.0.1  && < 3.3,
-     profunctors               >= 3.2      && < 4,
-     profunctor-extras         >= 3.3      && < 4,
+     profunctors               >= 4        && < 5,
 -    reflection                >= 1.1.6    && < 2,
-     semigroupoids             >= 3.0.2    && < 4,
+     semigroupoids             >= 4        && < 5,
      semigroups                >= 0.8.4    && < 1,
-     split                     == 0.2.*,
-@@ -237,7 +240,6 @@ library
+     split                     >= 0.2      && < 0.3,
+@@ -235,7 +238,6 @@
      Control.Lens.Review
      Control.Lens.Setter
      Control.Lens.Simple
@@ -48,7 +45,7 @@
      Control.Lens.Traversal
      Control.Lens.Tuple
      Control.Lens.Type
-@@ -268,14 +270,23 @@ library
+@@ -266,14 +268,23 @@
      Data.Typeable.Lens
      Data.Vector.Lens
      Data.Vector.Generic.Lens
@@ -76,7 +73,7 @@
    if flag(safe)
      cpp-options: -DSAFE=1
  
-@@ -308,6 +319,9 @@ test-suite templates
+@@ -306,6 +317,9 @@
    build-depends: base, lens
    ghc-options: -Wall -threaded
    hs-source-dirs: tests
@@ -86,11 +83,9 @@
  
    if flag(dump-splices)
      ghc-options: -ddump-splices
-diff --git a/src/Control/Lens/Internal/Exception.hs b/src/Control/Lens/Internal/Exception.hs
-index 387203e..43a59fa 100644
 --- a/src/Control/Lens/Internal/Exception.hs
 +++ b/src/Control/Lens/Internal/Exception.hs
-@@ -34,7 +34,9 @@ import Control.Monad.CatchIO as CatchIO
+@@ -34,7 +34,9 @@
  import Data.IORef
  import Data.Monoid
  import Data.Proxy
@@ -100,7 +95,7 @@
  import Data.Typeable
  import System.IO.Unsafe
  
-@@ -128,6 +130,7 @@ class Handleable e (m :: * -> *) (h :: * -> *) | h -> e m where
+@@ -128,6 +130,7 @@
    handler_ l = handler l . const
    {-# INLINE handler_ #-}
  
@@ -108,7 +103,7 @@
  instance Handleable SomeException IO Exception.Handler where
    handler = handlerIO
  
-@@ -139,6 +142,7 @@ handlerIO l f = reify (preview l) $ \ (_ :: Proxy s) -> Exception.Handler (\(Han
+@@ -139,6 +142,7 @@
  
  handlerCatchIO :: forall m a r. Getting (First a) SomeException a -> (a -> m r) -> CatchIO.Handler m r
  handlerCatchIO l f = reify (preview l) $ \ (_ :: Proxy s) -> CatchIO.Handler (\(Handling a :: Handling a s m) -> f a)
@@ -116,7 +111,7 @@
  
  ------------------------------------------------------------------------------
  -- Helpers
-@@ -172,8 +176,10 @@ instance Show (Handling a s m) where
+@@ -172,8 +176,10 @@
    showsPrec d _ = showParen (d > 10) $ showString "Handling ..."
    {-# INLINE showsPrec #-}
  
@@ -127,6 +122,3 @@
    fromException = fmap Handling . reflect (Proxy :: Proxy s)
    {-# INLINE fromException #-}
 +#endif
--- 
-1.8.4.rc3
-
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	2013-11-10 02:50:07.589550409 +0000
+++ new-haskell-lens/patches/fix-doctest-float-implementations.diff	2013-11-10 02:50:07.777793893 +0000
@@ -5,11 +5,9 @@
 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 @@
+@@ -671,8 +671,8 @@
  -- >>> (a,b) & both **~ c
  -- (a**c,b**c)
  --
diff -rN -u old-haskell-lens/patches/guard-ANNotations.patch new-haskell-lens/patches/guard-ANNotations.patch
--- old-haskell-lens/patches/guard-ANNotations.patch	2013-11-10 02:50:07.589550409 +0000
+++ new-haskell-lens/patches/guard-ANNotations.patch	2013-11-10 02:50:07.777793893 +0000
@@ -20,11 +20,9 @@
  src/Data/Data/Lens.hs               | 2 ++
  14 files changed, 31 insertions(+)
 
-diff --git a/src/Control/Exception/Lens.hs b/src/Control/Exception/Lens.hs
-index 4bc3926..13b7beb 100644
 --- a/src/Control/Exception/Lens.hs
 +++ b/src/Control/Exception/Lens.hs
-@@ -112,7 +112,9 @@ import Prelude
+@@ -112,7 +112,9 @@
    ,  Maybe(..), Either(..), Functor(..), String, IO
    )
  
@@ -34,19 +32,15 @@
  
  -- $setup
  -- >>> :set -XNoOverloadedStrings
-diff --git a/src/Control/Lens.hs b/src/Control/Lens.hs
-index 242c3c1..c53e6f6 100644
 --- a/src/Control/Lens.hs
 +++ b/src/Control/Lens.hs
-@@ -99,4 +99,6 @@ import Control.Lens.Wrapped
+@@ -99,4 +99,6 @@
  import Control.Lens.Zipper
  import Control.Lens.Zoom
  
 +#ifndef DISABLE_TEMPLATE_HASKELL
  {-# ANN module "HLint: ignore Use import/export shortcut" #-}
 +#endif
-diff --git a/src/Control/Lens/Equality.hs b/src/Control/Lens/Equality.hs
-index 982c2d7..b06d4b5 100644
 --- a/src/Control/Lens/Equality.hs
 +++ b/src/Control/Lens/Equality.hs
 @@ -1,3 +1,4 @@
@@ -54,7 +48,7 @@
  {-# LANGUAGE GADTs #-}
  {-# LANGUAGE Rank2Types #-}
  {-# LANGUAGE TypeFamilies #-}
-@@ -28,8 +29,10 @@ module Control.Lens.Equality
+@@ -28,8 +29,10 @@
  import Control.Lens.Internal.Setter
  import Control.Lens.Type
  
@@ -65,11 +59,9 @@
  
  -- $setup
  -- >>> import Control.Lens
-diff --git a/src/Control/Lens/Fold.hs b/src/Control/Lens/Fold.hs
-index 32a4073..459f959 100644
 --- a/src/Control/Lens/Fold.hs
 +++ b/src/Control/Lens/Fold.hs
-@@ -163,9 +163,11 @@ import Data.Traversable
+@@ -163,9 +163,11 @@
  -- >>> let g :: Expr -> Expr; g = Debug.SimpleReflect.Vars.g
  -- >>> let timingOut :: NFData a => a -> IO a; timingOut = fmap (fromMaybe (error "timeout")) . timeout (5*10^6) . evaluate . force
  
@@ -81,8 +73,6 @@
  
  infixl 8 ^.., ^?, ^?!, ^@.., ^@?, ^@?!
  
-diff --git a/src/Control/Lens/Internal.hs b/src/Control/Lens/Internal.hs
-index 295662e..6166014 100644
 --- a/src/Control/Lens/Internal.hs
 +++ b/src/Control/Lens/Internal.hs
 @@ -1,3 +1,4 @@
@@ -90,18 +80,16 @@
  -----------------------------------------------------------------------------
  -- |
  -- Module      :  Control.Lens.Internal
-@@ -43,4 +44,6 @@ import Control.Lens.Internal.Review
+@@ -43,4 +44,6 @@
  import Control.Lens.Internal.Setter
  import Control.Lens.Internal.Zoom
  
 +#ifndef DISABLE_TEMPLATE_HASKELL
  {-# ANN module "HLint: ignore Use import/export shortcut" #-}
 +#endif
-diff --git a/src/Control/Lens/Internal/Zipper.hs b/src/Control/Lens/Internal/Zipper.hs
-index 95875b7..2840bd9 100644
 --- a/src/Control/Lens/Internal/Zipper.hs
 +++ b/src/Control/Lens/Internal/Zipper.hs
-@@ -53,7 +53,9 @@ import Data.Profunctor.Unsafe
+@@ -53,7 +53,9 @@
  -- >>> import Control.Lens
  -- >>> import Data.Char
  
@@ -111,11 +99,9 @@
  
  ------------------------------------------------------------------------------
  -- * Jacket
-diff --git a/src/Control/Lens/Iso.hs b/src/Control/Lens/Iso.hs
-index 1152af4..66a9588 100644
 --- a/src/Control/Lens/Iso.hs
 +++ b/src/Control/Lens/Iso.hs
-@@ -82,7 +82,9 @@ import Data.Maybe
+@@ -82,7 +82,9 @@
  import Data.Profunctor
  import Data.Profunctor.Unsafe
  
@@ -125,11 +111,9 @@
  
  -- $setup
  -- >>> :set -XNoOverloadedStrings
-diff --git a/src/Control/Lens/Lens.hs b/src/Control/Lens/Lens.hs
-index b26cc06..e3fe89c 100644
 --- a/src/Control/Lens/Lens.hs
 +++ b/src/Control/Lens/Lens.hs
-@@ -126,7 +126,9 @@ import Data.Profunctor.Rep
+@@ -126,7 +126,9 @@
  import Data.Profunctor.Unsafe
  import Data.Void
  
@@ -139,8 +123,6 @@
  
  -- $setup
  -- >>> :set -XNoOverloadedStrings
-diff --git a/src/Control/Lens/Operators.hs b/src/Control/Lens/Operators.hs
-index 11868e0..1c062f3 100644
 --- a/src/Control/Lens/Operators.hs
 +++ b/src/Control/Lens/Operators.hs
 @@ -1,3 +1,4 @@
@@ -148,18 +130,16 @@
  -----------------------------------------------------------------------------
  -- |
  -- Module      :  Control.Lens.Operators
-@@ -108,4 +109,6 @@ import Control.Lens.Review
+@@ -108,4 +109,6 @@
  import Control.Lens.Setter
  import Control.Lens.Zipper
  
 +#ifndef DISABLE_TEMPLATE_HASKELL
  {-# ANN module "HLint: ignore Use import/export shortcut" #-}
 +#endif
-diff --git a/src/Control/Lens/Plated.hs b/src/Control/Lens/Plated.hs
-index a8c4d20..019fded 100644
 --- a/src/Control/Lens/Plated.hs
 +++ b/src/Control/Lens/Plated.hs
-@@ -95,7 +95,9 @@ import           Data.Data.Lens
+@@ -95,7 +95,9 @@
  import           Data.Monoid
  import           Data.Tree
  
@@ -169,12 +149,10 @@
  
  -- | A 'Plated' type is one where we know how to extract its immediate self-similar children.
  --
-diff --git a/src/Control/Lens/Prism.hs b/src/Control/Lens/Prism.hs
-index 0f3253f..e3a0a01 100644
 --- a/src/Control/Lens/Prism.hs
 +++ b/src/Control/Lens/Prism.hs
-@@ -51,7 +51,9 @@ import Data.Void
- import Unsafe.Coerce
+@@ -53,7 +53,9 @@
+ import Data.Profunctor.Unsafe
  #endif
  
 +#ifndef DISABLE_TEMPLATE_HASKELL
@@ -183,11 +161,9 @@
  
  -- $setup
  -- >>> :set -XNoOverloadedStrings
-diff --git a/src/Control/Lens/Setter.hs b/src/Control/Lens/Setter.hs
-index a1e953f..dc16dc4 100644
 --- a/src/Control/Lens/Setter.hs
 +++ b/src/Control/Lens/Setter.hs
-@@ -87,7 +87,9 @@ import Data.Profunctor
+@@ -87,7 +87,9 @@
  import Data.Profunctor.Rep
  import Data.Profunctor.Unsafe
  
@@ -197,11 +173,9 @@
  
  -- $setup
  -- >>> import Control.Lens
-diff --git a/src/Control/Lens/TH.hs b/src/Control/Lens/TH.hs
-index a05eb07..00353dc 100644
 --- a/src/Control/Lens/TH.hs
 +++ b/src/Control/Lens/TH.hs
-@@ -87,7 +87,9 @@ import Language.Haskell.TH
+@@ -87,7 +87,9 @@
  import Language.Haskell.TH.Syntax
  import Language.Haskell.TH.Lens
  
@@ -211,11 +185,9 @@
  
  -- | Flags for 'Lens' construction
  data LensFlag
-diff --git a/src/Data/Data/Lens.hs b/src/Data/Data/Lens.hs
-index cf1e7c9..52490b5 100644
 --- a/src/Data/Data/Lens.hs
 +++ b/src/Data/Data/Lens.hs
-@@ -65,9 +65,11 @@ import           Data.Monoid
+@@ -65,9 +65,11 @@
  import           GHC.Exts (realWorld#)
  #endif
  
@@ -227,6 +199,3 @@
  
  -- $setup
  -- >>> :set -XNoOverloadedStrings
--- 
-1.8.4.rc3
-




More information about the Pkg-haskell-commits mailing list