lens: Upgrading from 4.13 to 4.14

4 files changed, 64 insertions, 67 deletions

diff --git a/p/haskell-lens/debian/changelog b/p/haskell-lens/debian/changelog
index 82561f3a6..26ad732d4 100644
--- a/p/haskell-lens/debian/changelog
+++ b/p/haskell-lens/debian/changelog
@@ -1,14 +1,14 @@
-haskell-lens (4.13-2) UNRELEASED; urgency=medium
+haskell-lens (4.14-1) experimental; urgency=medium
 
   [ Dmitry Bogatov ]
   * Use secure (https) uri in Vcs-Git field in 'debian/control'
   * Bump standards version to 3.9.8 (no changes needed)
   * Convert `debian/copyright' to dep5 format
 
-  [ Gianfranco Costamagna ]
-  * Fix VCS fields
+  [ Clint Adams ]
+  * New upstream version.
 
- -- Dmitry Bogatov <KAction@gnu.org>  Tue, 10 May 2016 09:35:41 +0300
+ -- Clint Adams <clint@debian.org>  Fri, 07 Oct 2016 20:37:54 -0400
 
 haskell-lens (4.13-1) unstable; urgency=medium
 
diff --git a/p/haskell-lens/debian/control b/p/haskell-lens/debian/control
index 594aac91a..121793bb4 100644
--- a/p/haskell-lens/debian/control
+++ b/p/haskell-lens/debian/control
@@ -1,84 +1,87 @@
 Source: haskell-lens
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
-Uploaders: Clint Adams <clint@debian.org>
+Uploaders:
+ Clint Adams <clint@debian.org>,
 Priority: extra
 Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10),
+Build-Depends:
  cdbs,
- ghc,
+ debhelper (>= 9),
+ ghc (>= 8),
  ghc-prof,
- libghc-base-orphans-dev (>= 0.3),
+ haskell-devscripts (>= 0.10),
  libghc-base-orphans-dev (<< 1),
+ libghc-base-orphans-dev (>= 0.3),
  libghc-base-orphans-prof,
- libghc-bifunctors-dev (>= 5),
  libghc-bifunctors-dev (<< 6),
+ libghc-bifunctors-dev (>= 5),
  libghc-bifunctors-prof,
+ libghc-comonad-dev (<< 6),
  libghc-comonad-dev (>= 4),
- libghc-comonad-dev (<< 5),
  libghc-comonad-prof,
- libghc-contravariant-dev (>= 1.3),
  libghc-contravariant-dev (<< 2),
+ libghc-contravariant-dev (>= 1.3),
  libghc-contravariant-prof,
- libghc-distributive-dev (>= 0.3),
  libghc-distributive-dev (<< 1),
+ libghc-distributive-dev (>= 0.3),
  libghc-distributive-prof,
- libghc-exceptions-dev (>= 0.1.1),
  libghc-exceptions-dev (<< 1),
+ libghc-exceptions-dev (>= 0.1.1),
  libghc-exceptions-prof,
- libghc-free-dev (>= 4),
  libghc-free-dev (<< 5),
+ libghc-free-dev (>= 4),
  libghc-free-prof,
- libghc-hashable-dev (>= 1.1.2.3),
  libghc-hashable-dev (<< 1.3),
+ libghc-hashable-dev (>= 1.1.2.3),
  libghc-hashable-prof,
- libghc-kan-extensions-dev (>= 4.2.1),
- libghc-kan-extensions-dev (<< 5),
+ libghc-hunit-dev (>= 1.2),
+ libghc-kan-extensions-dev (<< 6),
+ libghc-kan-extensions-dev (>= 5),
  libghc-kan-extensions-prof,
- libghc-mtl-dev (>= 2.0.1),
+ libghc-mtl-dev,
  libghc-mtl-dev (<< 2.3),
+ libghc-mtl-dev (>= 2.0.1),
  libghc-mtl-prof,
- libghc-parallel-dev (>= 3.1.0.1),
  libghc-parallel-dev (<< 3.3),
+ libghc-parallel-dev (>= 3.1.0.1),
  libghc-parallel-prof,
- libghc-profunctors-dev (>= 5),
  libghc-profunctors-dev (<< 6),
+ libghc-profunctors-dev (>= 5),
  libghc-profunctors-prof,
- libghc-reflection-dev (>= 2.1),
+ libghc-quickcheck2-dev (>= 2.4),
  libghc-reflection-dev (<< 3),
+ libghc-reflection-dev (>= 2.1),
  libghc-reflection-prof,
- libghc-semigroupoids-dev (>= 5),
  libghc-semigroupoids-dev (<< 6),
+ libghc-semigroupoids-dev (>= 5),
  libghc-semigroupoids-prof,
- libghc-semigroups-dev (>= 0.8.4),
  libghc-semigroups-dev (<< 1),
+ libghc-semigroups-dev (>= 0.8.4),
  libghc-semigroups-prof,
- libghc-tagged-dev (>= 0.4.4),
  libghc-tagged-dev (<< 1),
+ libghc-tagged-dev (>= 0.4.4),
  libghc-tagged-prof,
- libghc-text-dev (>= 0.11),
+ 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 (<< 1.3),
+ libghc-text-dev (>= 0.11),
  libghc-text-prof,
- libghc-transformers-compat-dev (>= 0.4),
  libghc-transformers-compat-dev (<< 1),
+ libghc-transformers-compat-dev (>= 0.4),
  libghc-transformers-compat-prof,
- libghc-unordered-containers-dev (>= 0.2.4),
  libghc-unordered-containers-dev (<< 0.3),
+ libghc-unordered-containers-dev (>= 0.2.4),
  libghc-unordered-containers-prof,
- libghc-vector-dev (>= 0.9),
  libghc-vector-dev (<< 0.12),
+ libghc-vector-dev (>= 0.9),
  libghc-vector-prof,
- libghc-void-dev (>= 0.5),
  libghc-void-dev (<< 1),
+ libghc-void-dev (>= 0.5),
  libghc-void-prof,
- libghc-hunit-dev (>= 1.2),
- libghc-quickcheck2-dev (>= 2.4),
- libghc-mtl-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],
-Build-Depends-Indep: ghc-doc,
+Build-Depends-Indep:
+ ghc-doc,
  libghc-base-orphans-doc,
  libghc-bifunctors-doc,
  libghc-comonad-doc,
@@ -102,17 +105,21 @@ Build-Depends-Indep: ghc-doc,
  libghc-void-doc,
 Standards-Version: 3.9.8
 Homepage: http://github.com/ekmett/lens/
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-lens
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 
 Package: libghc-lens-dev
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends:
  ${haskell:Depends},
  ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+ ${shlibs:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
 Description: Lenses, Folds and Traversals
  This package comes "Batteries Included" with many useful lenses for the types
  commonly used from the Haskell Platform, and with tools for automatically
@@ -130,11 +137,15 @@ Description: Lenses, Folds and Traversals
 
 Package: libghc-lens-prof
 Architecture: any
-Depends: ${haskell:Depends},
+Depends:
+ ${haskell:Depends},
  ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
 Description: Lenses, Folds and Traversals; profiling libraries
  This package comes "Batteries Included" with many useful lenses for the types
  commonly used from the Haskell Platform, and with tools for automatically
@@ -153,10 +164,13 @@ Description: Lenses, Folds and Traversals; profiling libraries
 Package: libghc-lens-doc
 Architecture: all
 Section: doc
-Depends: ${haskell:Depends},
+Depends:
+ ${haskell:Depends},
  ${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
 Description: Lenses, Folds and Traversals; documentation
  This package comes "Batteries Included" with many useful lenses for the types
  commonly used from the Haskell Platform, and with tools for automatically
diff --git a/p/haskell-lens/debian/patches/fix-doctest-path.hs b/p/haskell-lens/debian/patches/fix-doctest-path.hs
deleted file mode 100644
index 77e96cd5c..000000000
--- a/p/haskell-lens/debian/patches/fix-doctest-path.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-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"
--  : "-idist/build/autogen"
-+  : "-idist-ghc/build/autogen"
-   : "-optP-include"
--  : "-optPdist/build/autogen/cabal_macros.h"
-+  : "-optPdist-ghc/build/autogen/cabal_macros.h"
-   : "-hide-all-packages"
- #ifdef TRUSTWORTHY
-   : "-DTRUSTWORTHY=1"
diff --git a/p/haskell-lens/debian/patches/series b/p/haskell-lens/debian/patches/series
index 729ba1de6..73ae2ef40 100644
--- a/p/haskell-lens/debian/patches/series
+++ b/p/haskell-lens/debian/patches/series
@@ -1,3 +1,2 @@
-fix-doctest-path.hs
 fudge-doctest-nonascii.diff
 flag-test-templates