diagrams-lib: Upgrading from 1.3.1.4 to 1.4.1.2

4 files changed, 22 insertions, 19 deletions

diff --git a/p/haskell-diagrams-lib/debian/changelog b/p/haskell-diagrams-lib/debian/changelog
index 665b138e5..8a13879e4 100644
--- a/p/haskell-diagrams-lib/debian/changelog
+++ b/p/haskell-diagrams-lib/debian/changelog
@@ -1,3 +1,9 @@
+haskell-diagrams-lib (1.4.1.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Thu, 06 Jul 2017 17:07:57 -0400
+
 haskell-diagrams-lib (1.3.1.4-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/p/haskell-diagrams-lib/debian/control b/p/haskell-diagrams-lib/debian/control
index ff11d5e49..6bae848f0 100644
--- a/p/haskell-diagrams-lib/debian/control
+++ b/p/haskell-diagrams-lib/debian/control
@@ -16,13 +16,17 @@ Build-Depends:
  libghc-adjunctions-dev (<< 5.0),
  libghc-adjunctions-dev (>= 4.0),
  libghc-adjunctions-prof,
+ libghc-cereal-dev (>= 0.4.1.1),
+ libghc-cereal-dev (<< 0.6),
+ libghc-cereal-prof,
+ libghc-colour-dev (>= 2.3.2),
  libghc-colour-dev (<< 2.4),
  libghc-colour-dev (>= 2.3.2),
  libghc-colour-prof,
  libghc-data-default-class-dev (<< 0.2),
  libghc-data-default-class-prof,
- libghc-diagrams-core-dev (<< 1.4),
- libghc-diagrams-core-dev (>= 1.3.0.8),
+ libghc-diagrams-core-dev (>= 1.4),
+ libghc-diagrams-core-dev (<< 1.5),
  libghc-diagrams-core-prof,
  libghc-diagrams-solve-dev (<< 0.2),
  libghc-diagrams-solve-dev (>= 0.1),
@@ -45,14 +49,14 @@ Build-Depends:
  libghc-hashable-dev (<< 1.3),
  libghc-hashable-dev (>= 1.1),
  libghc-hashable-prof,
- libghc-intervals-dev (<< 0.8),
- libghc-intervals-dev (>= 0.7),
- libghc-intervals-prof,
  libghc-juicypixels-dev (<< 3.3),
  libghc-juicypixels-dev (>= 3.1.5),
  libghc-juicypixels-prof,
- libghc-lens-dev (<< 4.15),
+ libghc-intervals-dev (>= 0.7),
+ libghc-intervals-dev (<< 0.9),
+ libghc-intervals-prof,
  libghc-lens-dev (>= 4.6),
+ libghc-lens-dev (<< 4.16),
  libghc-lens-prof,
  libghc-linear-dev (<< 1.21),
  libghc-linear-dev (>= 1.20.1),
@@ -66,8 +70,11 @@ Build-Depends:
  libghc-optparse-applicative-dev (<< 0.14),
  libghc-optparse-applicative-dev (>= 0.11),
  libghc-optparse-applicative-prof,
- libghc-semigroups-dev (<< 0.19),
+ libghc-profunctors-dev (>= 5.0),
+ libghc-profunctors-dev (<< 6.0),
+ libghc-profunctors-prof,
  libghc-semigroups-dev (>= 0.3.4),
+ libghc-semigroups-dev (<< 0.19),
  libghc-semigroups-prof,
  libghc-tagged-dev (>= 0.7),
  libghc-tagged-prof,
@@ -81,6 +88,7 @@ Build-Depends-Indep:
  ghc-doc,
  libghc-active-doc,
  libghc-adjunctions-doc,
+ libghc-cereal-doc,
  libghc-colour-doc,
  libghc-data-default-class-doc,
  libghc-diagrams-core-doc,
@@ -98,6 +106,7 @@ Build-Depends-Indep:
  libghc-monoid-extras-doc,
  libghc-mtl-doc,
  libghc-optparse-applicative-doc,
+ libghc-profunctors-doc,
  libghc-semigroups-doc,
  libghc-tagged-doc,
  libghc-text-doc,
diff --git a/p/haskell-diagrams-lib/debian/patches/bump-directory-bounds.patch b/p/haskell-diagrams-lib/debian/patches/bump-directory-bounds.patch
deleted file mode 100644
index 72071f5f7..000000000
--- a/p/haskell-diagrams-lib/debian/patches/bump-directory-bounds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- haskell-diagrams-lib-1.3.1.4.orig/diagrams-lib.cabal
-+++ haskell-diagrams-lib-1.3.1.4/diagrams-lib.cabal
-@@ -123,7 +123,7 @@ Library
-                        distributive >=0.2.2 && < 1.0,
-                        process >= 1.1 && < 1.5,
-                        fsnotify >= 0.2.1 && < 0.3,
--                       directory >= 1.2 && < 1.3,
-+                       directory >= 1.2 && < 1.4,
-                        unordered-containers >= 0.2 && < 0.3,
-                        text >= 0.7.1 && < 1.3,
-                        mtl >= 2.0 && < 2.3,
diff --git a/p/haskell-diagrams-lib/debian/patches/series b/p/haskell-diagrams-lib/debian/patches/series
deleted file mode 100644
index 7bd82d63c..000000000
--- a/p/haskell-diagrams-lib/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-bump-directory-bounds.patch