lens: Upgrading from 4.7.0.1 to 4.12.3

5 files changed, 51 insertions, 53 deletions

diff --git a/p/haskell-lens/debian/changelog b/p/haskell-lens/debian/changelog
index 83eea22e4..c199f43a1 100644
--- a/p/haskell-lens/debian/changelog
+++ b/p/haskell-lens/debian/changelog
@@ -1,3 +1,9 @@
+haskell-lens (4.12.3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata@debian.org>  Sat, 15 Aug 2015 14:17:49 +0200
+
 haskell-lens (4.7.0.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/p/haskell-lens/debian/control b/p/haskell-lens/debian/control
index 297b9b335..264b75e99 100644
--- a/p/haskell-lens/debian/control
+++ b/p/haskell-lens/debian/control
@@ -8,8 +8,11 @@ Build-Depends: debhelper (>= 9),
  cdbs,
  ghc,
  ghc-prof,
- libghc-bifunctors-dev (>= 4),
- libghc-bifunctors-dev (<< 5),
+ libghc-base-orphans-dev (>= 0.3),
+ libghc-base-orphans-dev (<< 1),
+ libghc-base-orphans-prof,
+ libghc-bifunctors-dev (>= 5),
+ libghc-bifunctors-dev (<< 6),
  libghc-bifunctors-prof,
  libghc-comonad-dev (>= 4),
  libghc-comonad-dev (<< 5),
@@ -29,67 +32,54 @@ Build-Depends: debhelper (>= 9),
  libghc-hashable-dev (>= 1.1.2.3),
  libghc-hashable-dev (<< 1.3),
  libghc-hashable-prof,
+ libghc-kan-extensions-dev (>= 4.2.1),
+ libghc-kan-extensions-dev (<< 5),
+ libghc-kan-extensions-prof,
  libghc-mtl-dev (>= 2.0.1),
  libghc-mtl-dev (<< 2.3),
  libghc-mtl-prof,
  libghc-parallel-dev (>= 3.1.0.1),
  libghc-parallel-dev (<< 3.3),
  libghc-parallel-prof,
- libghc-primitive-dev (>= 0.4.0.1),
- libghc-primitive-dev (<< 0.7),
- libghc-primitive-prof,
- libghc-profunctors-dev (>= 4),
- libghc-profunctors-dev (<< 5),
+ libghc-profunctors-dev (>= 5),
+ libghc-profunctors-dev (<< 6),
  libghc-profunctors-prof,
- libghc-reflection-dev (>= 1.1.6),
- libghc-reflection-dev (<< 2),
+ libghc-reflection-dev (>= 2),
+ libghc-reflection-dev (<< 3),
  libghc-reflection-prof,
- libghc-semigroupoids-dev (>= 4),
- libghc-semigroupoids-dev (<< 5),
+ libghc-semigroupoids-dev (>= 5),
+ libghc-semigroupoids-dev (<< 6),
  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,
  libghc-text-dev (>= 0.11),
  libghc-text-dev (<< 1.3),
  libghc-text-prof,
- libghc-transformers-compat-dev (>= 0.3),
+ libghc-transformers-compat-dev (>= 0.4),
  libghc-transformers-compat-dev (<< 1),
  libghc-transformers-compat-prof,
- libghc-unordered-containers-dev (>= 0.2),
+ libghc-unordered-containers-dev (>= 0.2.4),
  libghc-unordered-containers-dev (<< 0.3),
  libghc-unordered-containers-prof,
  libghc-vector-dev (>= 0.9),
- libghc-vector-dev (<< 0.11),
+ libghc-vector-dev (<< 0.12),
  libghc-vector-prof,
  libghc-void-dev (>= 0.5),
  libghc-void-dev (<< 1),
  libghc-void-prof,
  libghc-hunit-dev (>= 1.2),
  libghc-quickcheck2-dev (>= 2.4),
- libghc-doctest-dev (>= 0.9.1),
- libghc-generic-deriving-dev,
- libghc-hlint-dev (>= 1.7),
  libghc-mtl-dev,
- libghc-nats-dev,
- libghc-parallel-dev,
- libghc-semigroups-dev (>= 0.9),
- libghc-simple-reflect-dev (>= 0.3.1),
- libghc-split-dev,
  libghc-test-framework-dev (>= 0.6),
  libghc-test-framework-hunit-dev (>= 0.2),
  libghc-test-framework-quickcheck2-dev (>= 0.2),
- libghc-test-framework-th-dev (>= 0.2)[arm64 armel armhf powerpc ppc64el s390x sparc any-amd64 any-i386],
- libghc-text-dev,
- libghc-unordered-containers-dev,
- libghc-vector-dev,
+ libghc-test-framework-th-dev (>= 0.2) [arm64 armel armhf powerpc ppc64el s390x sparc any-amd64 any-i386],
 Build-Depends-Indep: ghc-doc,
+ libghc-base-orphans-doc,
  libghc-bifunctors-doc,
  libghc-comonad-doc,
  libghc-contravariant-doc,
@@ -97,14 +87,13 @@ Build-Depends-Indep: ghc-doc,
  libghc-exceptions-doc,
  libghc-free-doc,
  libghc-hashable-doc,
+ libghc-kan-extensions-doc,
  libghc-mtl-doc,
  libghc-parallel-doc,
- libghc-primitive-doc,
  libghc-profunctors-doc,
  libghc-reflection-doc,
  libghc-semigroupoids-doc,
  libghc-semigroups-doc,
- libghc-split-doc,
  libghc-tagged-doc,
  libghc-text-doc,
  libghc-transformers-compat-doc,
diff --git a/p/haskell-lens/debian/patches/fix-doctest-path.hs b/p/haskell-lens/debian/patches/fix-doctest-path.hs
index a2e142c8e..77e96cd5c 100644
--- a/p/haskell-lens/debian/patches/fix-doctest-path.hs
+++ b/p/haskell-lens/debian/patches/fix-doctest-path.hs
@@ -1,6 +1,8 @@
---- a/tests/doctests.hsc
-+++ b/tests/doctests.hsc
-@@ -54,9 +54,9 @@
+Index: haskell-lens/tests/doctests.hsc
+===================================================================
+--- haskell-lens.orig/tests/doctests.hsc	2015-08-15 14:18:10.501591463 +0200
++++ haskell-lens/tests/doctests.hsc	2015-08-15 14:18:10.501591463 +0200
+@@ -56,9 +56,9 @@
  main :: IO ()
  main = withUnicode $ getSources >>= \sources -> doctest $
      "-isrc"
@@ -10,5 +12,5 @@
 -  : "-optPdist/build/autogen/cabal_macros.h"
 +  : "-optPdist-ghc/build/autogen/cabal_macros.h"
    : "-hide-all-packages"
-   : map ("-package="++) deps ++ sources
-
+ #ifdef TRUSTWORTHY
+   : "-DTRUSTWORTHY=1"
diff --git a/p/haskell-lens/debian/patches/flag-test-templates b/p/haskell-lens/debian/patches/flag-test-templates
index b31d97ca4..3e30a790a 100644
--- a/p/haskell-lens/debian/patches/flag-test-templates
+++ b/p/haskell-lens/debian/patches/flag-test-templates
@@ -1,11 +1,11 @@
-Index: lens-4.6.0.1/lens.cabal
+Index: haskell-lens/lens.cabal
 ===================================================================
---- lens-4.6.0.1.orig/lens.cabal	2015-06-20 16:11:21.128425436 +0200
-+++ lens-4.6.0.1/lens.cabal	2015-06-20 16:12:38.766233282 +0200
-@@ -146,6 +146,11 @@
+--- haskell-lens.orig/lens.cabal	2015-08-15 14:18:19.157739242 +0200
++++ haskell-lens/lens.cabal	2015-08-15 14:18:19.153739174 +0200
+@@ -145,6 +145,11 @@
    default: True
    manual: True
-
+ 
 +-- You can disable the templates test suite with -f-test-templates
 +flag test-templates
 +  default: True
@@ -14,12 +14,13 @@ Index: lens-4.6.0.1/lens.cabal
  -- You can disable the doctests test suite with -f-test-doctests
  flag test-doctests
    default: True
-@@ -336,6 +341,9 @@
-   ghc-options: -Wall -Werror -threaded
+@@ -327,6 +332,9 @@
+   ghc-options: -Wall -threaded
    hs-source-dirs: tests
-
+ 
 +  if !flag(test-templates)
 +    buildable: False
 +
    if flag(dump-splices)
      ghc-options: -ddump-splices
+ 
diff --git a/p/haskell-lens/debian/patches/fudge-doctest-nonascii.diff b/p/haskell-lens/debian/patches/fudge-doctest-nonascii.diff
index 5b014ec17..6892176c3 100644
--- a/p/haskell-lens/debian/patches/fudge-doctest-nonascii.diff
+++ b/p/haskell-lens/debian/patches/fudge-doctest-nonascii.diff
@@ -1,18 +1,18 @@
-Index: lens-4.6.0.1/src/Data/Complex/Lens.hs
+Index: haskell-lens/src/Data/Complex/Lens.hs
 ===================================================================
---- lens-4.6.0.1.orig/src/Data/Complex/Lens.hs	2014-12-22 00:17:16.254766098 +0100
-+++ lens-4.6.0.1/src/Data/Complex/Lens.hs	2014-12-22 00:17:16.250766018 +0100
-@@ -30,7 +30,7 @@
-
+--- haskell-lens.orig/src/Data/Complex/Lens.hs	2015-08-15 14:18:16.089686794 +0200
++++ haskell-lens/src/Data/Complex/Lens.hs	2015-08-15 14:18:16.085686726 +0200
+@@ -35,7 +35,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.
  --
-@@ -104,7 +104,7 @@
-
+@@ -101,7 +101,7 @@
+ 
  -- | Access the 'phase' of a 'Complex' number.
  --
 --- >>> (mkPolar 10 (2-pi) & _phase +~ pi & view _phase) ≈ 2
@@ -20,7 +20,7 @@ Index: lens-4.6.0.1/src/Data/Complex/Lens.hs
  -- True
  --
  -- This isn't /quite/ a legal 'Lens'. Notably the
-@@ -126,7 +126,7 @@
+@@ -123,7 +123,7 @@
  -- >>> (2.0 :+ 3.0) & _conjugate . _imagPart -~ 1
  -- 2.0 :+ 4.0
  --