[DHG_packages] 01/01: servant-server: fix patch

Clint Adams clint at moszumanska.debian.org
Thu Jul 20 23:56:53 UTC 2017


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

clint pushed a commit to branch master
in repository DHG_packages.

commit 5eaf9f181ef180b24ea548ba3ef83c7993026170
Author: Clint Adams <clint at debian.org>
Date:   Thu Jul 20 19:56:37 2017 -0400

    servant-server: fix patch
---
 p/haskell-servant-server/debian/changelog             | 6 ++++++
 p/haskell-servant-server/debian/patches/hspec-wai-0.8 | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/p/haskell-servant-server/debian/changelog b/p/haskell-servant-server/debian/changelog
index c762bb1..98e17aa 100644
--- a/p/haskell-servant-server/debian/changelog
+++ b/p/haskell-servant-server/debian/changelog
@@ -1,3 +1,9 @@
+haskell-servant-server (0.9.1.1-3) unstable; urgency=medium
+
+  * Fix hspec-wai patch.
+
+ -- Clint Adams <clint at debian.org>  Thu, 20 Jul 2017 19:56:10 -0400
+
 haskell-servant-server (0.9.1.1-2) unstable; urgency=medium
 
   * Patch to build with hspec-wai 0.8.  closes: #869145.
diff --git a/p/haskell-servant-server/debian/patches/hspec-wai-0.8 b/p/haskell-servant-server/debian/patches/hspec-wai-0.8
index 951b554..8c5863b 100644
--- a/p/haskell-servant-server/debian/patches/hspec-wai-0.8
+++ b/p/haskell-servant-server/debian/patches/hspec-wai-0.8
@@ -1,6 +1,6 @@
 --- a/test/Servant/Server/ErrorSpec.hs
 +++ b/test/Servant/Server/ErrorSpec.hs
-@@ -211,11 +211,11 @@
+@@ -211,11 +211,16 @@
  
    it "should continue when URLs don't match" $ do
      request methodPost "" [jsonCT, jsonAccept] jsonBody
@@ -11,6 +11,11 @@
      request methodGet "a" [jsonCT, jsonAccept] jsonBody
 -     `shouldRespondWith` 200 { matchBody = Just $ encode (4 :: Int) }
 +     `shouldRespondWith` 200 { matchBody = mkBody $ encode (4 :: Int) }
++  where
++    mkBody b = MatchBody $ \_ b' ->
++      if b == b'
++        then Nothing
++        else Just "body not correct\n"
  
  -- }}}
  ------------------------------------------------------------------------------

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



More information about the Pkg-haskell-commits mailing list