binary-orphans: Upgrading from 0.1.5.1 to 0.1.6.0

5 files changed, 25 insertions, 61 deletions

diff --git a/p/haskell-binary-orphans/debian/changelog b/p/haskell-binary-orphans/debian/changelog
index 9257a0760..aaea7d52b 100644
--- a/p/haskell-binary-orphans/debian/changelog
+++ b/p/haskell-binary-orphans/debian/changelog
@@ -1,3 +1,9 @@
+haskell-binary-orphans (0.1.6.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Sat, 17 Jun 2017 13:28:55 -0400
+
 haskell-binary-orphans (0.1.5.1-4) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/haskell-binary-orphans/debian/control b/p/haskell-binary-orphans/debian/control
index 7eb60e067..37f73bcd5 100644
--- a/p/haskell-binary-orphans/debian/control
+++ b/p/haskell-binary-orphans/debian/control
@@ -10,8 +10,8 @@ Build-Depends:
  ghc (>= 8),
  ghc-prof,
  haskell-devscripts (>= 0.13),
- libghc-aeson-dev (<< 1.1),
  libghc-aeson-dev (>= 0.7.0.6),
+ libghc-aeson-dev (<< 1.3),
  libghc-aeson-prof,
  libghc-case-insensitive-dev (<< 1.2.1),
  libghc-case-insensitive-dev (>= 1.2.0.4),
@@ -29,8 +29,8 @@ Build-Depends:
  libghc-semigroups-dev (<< 0.18.3),
  libghc-semigroups-dev (>= 0.16.2.2),
  libghc-semigroups-prof,
- libghc-tagged-dev (<< 0.8.6),
  libghc-tagged-dev (>= 0.7.3),
+ libghc-tagged-dev (<< 0.8.6),
  libghc-tagged-prof,
  libghc-tasty-dev (<< 0.12),
  libghc-tasty-dev (>= 0.10.1.2),
@@ -45,12 +45,12 @@ Build-Depends:
  libghc-unordered-containers-dev (<< 0.3),
  libghc-unordered-containers-dev (>= 0.2.5.1),
  libghc-unordered-containers-prof,
+ libghc-vector-dev (>= 0.10.12.3),
+ libghc-vector-dev (<< 0.13),
+ libghc-vector-prof,
  libghc-vector-binary-instances-dev (<< 0.3),
  libghc-vector-binary-instances-dev (>= 0.2.1.0),
  libghc-vector-binary-instances-prof,
- libghc-vector-dev (<< 0.12),
- libghc-vector-dev (>= 0.10.12.3),
- libghc-vector-prof,
 Build-Depends-Indep:
  ghc-doc,
  libghc-aeson-doc,
diff --git a/p/haskell-binary-orphans/debian/patches/newer-aeson b/p/haskell-binary-orphans/debian/patches/newer-aeson
new file mode 100644
index 000000000..7c5a63df2
--- /dev/null
+++ b/p/haskell-binary-orphans/debian/patches/newer-aeson
@@ -0,0 +1,13 @@
+--- a/binary-orphans.cabal
++++ b/binary-orphans.cabal
+@@ -27,8 +27,8 @@
+   ghc-options: -Wall -fno-warn-orphans
+   build-depends:
+       base                     >=4.6.0.1   && <4.10
+-    , aeson                    >=0.7.0.6   && <1.2
+-    , binary                   >=0.5.1.1   && <0.8.5
++    , aeson                    >=0.7.0.6   && <1.3
++    , binary                   >=0.5.1.1   && <0.8.6
+     , case-insensitive         >=1.2.0.4   && <1.2.1
+     , hashable                 >=1.2.3.3   && <1.3
+     , scientific               >=0.3.3.8   && <0.4
diff --git a/p/haskell-binary-orphans/debian/patches/newer-deps b/p/haskell-binary-orphans/debian/patches/newer-deps
deleted file mode 100644
index 39587bccd..000000000
--- a/p/haskell-binary-orphans/debian/patches/newer-deps
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/binary-orphans.cabal
-+++ b/binary-orphans.cabal
-@@ -31,12 +31,12 @@
-   ghc-options: -Wall -fno-warn-orphans
-   build-depends:
-       base                     >=4.6.0.1   && <4.10
--    , aeson                    >=0.7.0.6   && <0.11.3
-+    , aeson                    >=0.7.0.6   && <1.1
-     , binary                   >=0.5.1.1   && <0.8.5
-     , case-insensitive         >=1.2.0.4   && <1.2.1
-     , hashable                 >=1.2.3.3   && <1.3
-     , scientific               >=0.3.3.8   && <0.4
--    , tagged                   >=0.7.3     && <0.8.5
-+    , tagged                   >=0.7.3     && <0.8.6
-     , text                     >=1.2.0.6   && <1.3
-     , time                     >=1.4.0.1   && <1.6.1
-     , unordered-containers     >=0.2.5.1   && <0.3
-@@ -45,7 +45,7 @@
-     , vector-binary-instances  >=0.2.1.0 && <0.3
-   if !impl(ghc >= 8.0)
-     build-depends:
--        semigroups               >=0.16.2.2  && <0.18.2
-+        semigroups               >=0.16.2.2  && <0.18.3
-   if !impl(ghc >= 7.10)
-     build-depends:
-         void                     >=0.7       && <0.8
-@@ -62,24 +62,24 @@
-   ghc-options: -Wall -fno-warn-orphans
-   build-depends:
-       base                     >=4.6.0.1   && <4.10
--    , aeson                    >=0.7.0.6   && <0.11.3
-+    , aeson                    >=0.7.0.6   && <1.1
-     , binary                   >=0.5.1.1   && <0.8.5
-     , case-insensitive         >=1.2.0.4   && <1.2.1
-     , hashable                 >=1.2.3.3   && <1.3
-     , scientific               >=0.3.3.8   && <0.4
--    , tagged                   >=0.7.3     && <0.8.5
-+    , tagged                   >=0.7.3     && <0.8.6
-     , text                     >=1.2.0.6   && <1.3
-     , time                     >=1.4.0.1   && <1.6.1
-     , unordered-containers     >=0.2.5.1   && <0.3
-     , vector                   >=0.10.12.3 && <0.12
-     , binary-orphans
--    , QuickCheck           >=2.7      && <2.9.2
-+    , QuickCheck           >=2.7      && <2.9.3
-     , quickcheck-instances >=0.3.11   && <0.3.13
-     , tasty                >=0.10.1.2 && <0.12
-     , tasty-quickcheck     >=0.8.3.2  && <0.9
-   if !impl(ghc >= 8.0)
-     build-depends:
--        semigroups               >=0.16.2.2  && <0.18.2
-+        semigroups               >=0.16.2.2  && <0.18.3
-   if !impl(ghc >= 7.10)
-     build-depends:
-         void                     >=0.7       && <0.8
diff --git a/p/haskell-binary-orphans/debian/patches/series b/p/haskell-binary-orphans/debian/patches/series
index 58889b715..e38a34345 100644
--- a/p/haskell-binary-orphans/debian/patches/series
+++ b/p/haskell-binary-orphans/debian/patches/series
@@ -1 +1 @@
-newer-deps
+newer-aeson