[DHG_packages] 11/20: servant-server: Upload to unstable

[Ilias Tsitsimpis]

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

iliastsi-guest pushed a commit to branch master
in repository DHG_packages.

commit b702a3679e4505bdca77a0060a1adc20394300cd
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Sun Nov 5 13:30:41 2017 +0200

    servant-server: Upload to unstable
---
 p/haskell-servant-server/debian/changelog           |  3 ++-
 .../debian/patches/hspec-wai-0.8                    | 21 ---------------------
 p/haskell-servant-server/debian/patches/series      |  1 -
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/p/haskell-servant-server/debian/changelog b/p/haskell-servant-server/debian/changelog
index 2a84404..7c9535b 100644
--- a/p/haskell-servant-server/debian/changelog
+++ b/p/haskell-servant-server/debian/changelog
@@ -9,8 +9,9 @@ haskell-servant-server (0.11-1) unstable; urgency=medium
   * Use the HTTPS form of the copyright-format URL
   * Modify d/watch and Source field in d/copyright to use HTTPS
   * Declare compliance with Debian policy 4.1.1
+  * Drop hspec-wai-0.8 patch, applied upstream
 
- -- Sean Whitton <spwhitton at spwhitton.name>  Sun, 03 Sep 2017 14:05:31 -0700
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 05 Nov 2017 13:33:23 +0200
 
 haskell-servant-server (0.9.1.1-3) unstable; urgency=medium
 
diff --git a/p/haskell-servant-server/debian/patches/hspec-wai-0.8 b/p/haskell-servant-server/debian/patches/hspec-wai-0.8
deleted file mode 100644
index 8c5863b..0000000
--- a/p/haskell-servant-server/debian/patches/hspec-wai-0.8
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/test/Servant/Server/ErrorSpec.hs
-+++ b/test/Servant/Server/ErrorSpec.hs
-@@ -211,11 +211,16 @@
- 
-   it "should continue when URLs don't match" $ do
-     request methodPost "" [jsonCT, jsonAccept] jsonBody
--     `shouldRespondWith` 200 { matchBody = Just $ encode (8 :: Int) }
-+     `shouldRespondWith` 200 { matchBody = mkBody $ encode (8 :: Int) }
- 
-   it "should continue when methods don't match" $ do
-     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"
- 
- -- }}}
- ------------------------------------------------------------------------------
diff --git a/p/haskell-servant-server/debian/patches/series b/p/haskell-servant-server/debian/patches/series
deleted file mode 100644
index a4cbebb..0000000
--- a/p/haskell-servant-server/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-hspec-wai-0.8

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