github: Upgrading from 0.14.1 to 0.15.0

5 files changed, 17 insertions, 33 deletions

diff --git a/p/haskell-github/debian/changelog b/p/haskell-github/debian/changelog
index 6300d6837..75d939277 100644
--- a/p/haskell-github/debian/changelog
+++ b/p/haskell-github/debian/changelog
@@ -1,3 +1,9 @@
+haskell-github (0.15.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Sat, 17 Jun 2017 14:38:32 -0400
+
 haskell-github (0.14.1-4) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/haskell-github/debian/control b/p/haskell-github/debian/control
index 9e497b147..d2ac16672 100644
--- a/p/haskell-github/debian/control
+++ b/p/haskell-github/debian/control
@@ -10,17 +10,17 @@ Build-Depends:
  ghc (>= 8),
  ghc-prof,
  haskell-devscripts (>= 0.13),
- libghc-aeson-compat-dev (<< 0.4),
- libghc-aeson-compat-dev (>= 0.3.0.0),
- libghc-aeson-compat-prof,
- libghc-aeson-dev (<< 0.12),
  libghc-aeson-dev (>= 0.7.0.6),
+ libghc-aeson-dev (<< 1.1),
  libghc-aeson-prof,
+ libghc-aeson-compat-dev (>= 0.3.0.0),
+ libghc-aeson-compat-dev (<< 0.4),
+ libghc-aeson-compat-prof,
  libghc-attoparsec-dev (<< 0.14),
  libghc-attoparsec-dev (>= 0.11.3.4),
  libghc-attoparsec-prof,
+ libghc-base-compat-dev (>= 0.9.1),
  libghc-base-compat-dev (<< 0.10),
- libghc-base-compat-dev (>= 0.6.0),
  libghc-base-compat-prof,
  libghc-base16-bytestring-dev (<< 0.2),
  libghc-base16-bytestring-dev (>= 0.1.1.6),
@@ -45,11 +45,11 @@ Build-Depends:
  libghc-hashable-dev (>= 1.2.3.3),
  libghc-hashable-prof,
  libghc-hspec-dev,
- libghc-http-client-dev (<< 0.5),
  libghc-http-client-dev (>= 0.4.8.1),
+ libghc-http-client-dev (<< 0.6),
  libghc-http-client-prof,
- libghc-http-client-tls-dev (<< 0.3),
  libghc-http-client-tls-dev (>= 0.2.2),
+ libghc-http-client-tls-dev (<< 0.4),
  libghc-http-client-tls-prof,
  libghc-http-link-header-dev (<< 1.1),
  libghc-http-link-header-dev (>= 1.0.1),
@@ -72,6 +72,9 @@ Build-Depends:
  libghc-text-dev (<< 1.3),
  libghc-text-dev (>= 1.2.0.6),
  libghc-text-prof,
+ libghc-tls-dev (>= 1.3.5),
+ libghc-tls-prof,
+ libghc-transformers-compat-dev (>= 0.4.0.3),
  libghc-transformers-compat-dev (<< 0.6),
  libghc-transformers-compat-dev (>= 0.4.0.3),
  libghc-transformers-compat-prof,
@@ -106,6 +109,7 @@ Build-Depends-Indep:
  libghc-network-uri-doc,
  libghc-semigroups-doc,
  libghc-text-doc,
+ libghc-tls-doc,
  libghc-transformers-compat-doc,
  libghc-unordered-containers-doc,
  libghc-vector-doc,
diff --git a/p/haskell-github/debian/patches/new-metadata-from-hackage b/p/haskell-github/debian/patches/new-metadata-from-hackage
deleted file mode 100644
index 848a03653..000000000
--- a/p/haskell-github/debian/patches/new-metadata-from-hackage
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: haskell-github/github.cabal
-===================================================================
---- haskell-github.orig/github.cabal	2016-02-02 13:09:06.000000000 +0100
-+++ haskell-github/github.cabal	2016-06-01 10:49:25.032434874 +0200
-@@ -99,7 +99,7 @@
- 
-   -- Packages needed in order to build this package.
-   build-depends: base                  >= 4.7      && <4.9,
--                 aeson                 >=0.7.0.6   && <0.11,
-+                 aeson                 >=0.7.0.6   && <0.12,
-                  attoparsec            >=0.11.3.4  && <0.14,
-                  base-compat           >=0.6.0     && <0.10,
-                  base16-bytestring     >=0.1.1.6   && <0.2,
diff --git a/p/haskell-github/debian/patches/newer-base b/p/haskell-github/debian/patches/newer-base
deleted file mode 100644
index 747c7eae9..000000000
--- a/p/haskell-github/debian/patches/newer-base
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/github.cabal
-+++ b/github.cabal
-@@ -98,7 +98,7 @@ Library
-     GitHub.Request
- 
-   -- Packages needed in order to build this package.
--  build-depends: base                  >= 4.7      && <4.9,
-+  build-depends: base                  >= 4.7      && <4.10,
-                  aeson                 >=0.7.0.6   && <0.12,
-                  attoparsec            >=0.11.3.4  && <0.14,
-                  base-compat           >=0.6.0     && <0.10,
diff --git a/p/haskell-github/debian/patches/series b/p/haskell-github/debian/patches/series
deleted file mode 100644
index 51baea42c..000000000
--- a/p/haskell-github/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-new-metadata-from-hackage
-newer-base