[DHG_packages] 01/01: servant: patch deps

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository DHG_packages.

commit 5089d1268996b6fc24084d69c566d6cc8fa62a04
Author: Clint Adams <clint at debian.org>
Date:   Wed Oct 4 19:44:35 2017 -0400

    servant: patch deps
---
 p/haskell-servant/debian/control                   |  2 +-
 p/haskell-servant/debian/patches/fix-doctest.diff  | 22 ----------------------
 .../debian/patches/newer-deps-from-hackage         | 19 +++++++++++++++++++
 p/haskell-servant/debian/patches/series            |  2 +-
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/p/haskell-servant/debian/control b/p/haskell-servant/debian/control
index d81fca6..f527499 100644
--- a/p/haskell-servant/debian/control
+++ b/p/haskell-servant/debian/control
@@ -25,8 +25,8 @@ Build-Depends:
  libghc-http-api-data-dev (>= 0.3),
  libghc-http-api-data-dev (<< 0.4),
  libghc-http-api-data-prof,
- libghc-http-media-dev (<< 0.7),
  libghc-http-media-dev (>= 0.4),
+ libghc-http-media-dev (<< 0.8),
  libghc-http-media-prof,
  libghc-http-types-dev (<< 0.10),
  libghc-http-types-dev (>= 0.8),
diff --git a/p/haskell-servant/debian/patches/fix-doctest.diff b/p/haskell-servant/debian/patches/fix-doctest.diff
deleted file mode 100644
index b775978..0000000
--- a/p/haskell-servant/debian/patches/fix-doctest.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: haskell-servant/test/Doctests.hs
-===================================================================
---- haskell-servant.orig/test/Doctests.hs	2016-06-01 10:24:35.430202851 +0200
-+++ haskell-servant/test/Doctests.hs	2016-06-01 10:25:00.642707368 +0200
-@@ -20,14 +20,14 @@
- 
- getCabalMacrosFile :: IO (Maybe FilePath)
- getCabalMacrosFile = do
--  exists <- doesDirectoryExist "dist"
-+  exists <- doesDirectoryExist "dist-ghc"
-   if exists
-     then do
--      contents <- getDirectoryContents "dist"
-+      contents <- getDirectoryContents "dist-ghc"
-       let rest = "build" </> "autogen" </> "cabal_macros.h"
-       whenExists $ case filter ("dist-sandbox-" `isPrefixOf`) contents of
-         [x] -> "dist" </> x </> rest
--        [] -> "dist" </> rest
-+        [] -> "dist-ghc" </> rest
-         xs -> error $ "ran doctests with multiple dist/dist-sandbox-xxxxx's: \n"
-                     ++ show xs ++ "\nTry cabal clean"
-     else return Nothing
diff --git a/p/haskell-servant/debian/patches/newer-deps-from-hackage b/p/haskell-servant/debian/patches/newer-deps-from-hackage
new file mode 100644
index 0000000..5dd058d
--- /dev/null
+++ b/p/haskell-servant/debian/patches/newer-deps-from-hackage
@@ -0,0 +1,19 @@
+--- a/servant.cabal
++++ b/servant.cabal
+@@ -57,14 +57,14 @@
+     Servant.Utils.Links
+     Servant.Utils.Enter
+   build-depends:
+-      base                  >= 4.7  && < 4.10
++      base                  >= 4.7  && < 4.11
+     , base-compat           >= 0.9  && < 0.10
+     , aeson                 >= 0.7  && < 1.3
+     , attoparsec            >= 0.12 && < 0.14
+     , bytestring            >= 0.10 && < 0.11
+     , case-insensitive      >= 1.2  && < 1.3
+     , http-api-data         >= 0.3  && < 0.4
+-    , http-media            >= 0.4  && < 0.7
++    , http-media            >= 0.4  && < 0.8
+     , http-types            >= 0.8  && < 0.10
+     , natural-transformation >= 0.4 && < 0.5
+     , mtl                   >= 2.0  && < 2.3
diff --git a/p/haskell-servant/debian/patches/series b/p/haskell-servant/debian/patches/series
index 5b2011a..30c91d0 100644
--- a/p/haskell-servant/debian/patches/series
+++ b/p/haskell-servant/debian/patches/series
@@ -1 +1 @@
-fix-doctest.diff
+newer-deps-from-hackage

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git