[DHG_packages] 05/06: refresh haskell-servant patch

[Sean Whitton]

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

spw-guest pushed a commit to branch LTS-6
in repository DHG_packages.

commit 28c79340ca427a0b41a1ba0b79befde6b29c34f0
Author: Sean Whitton <spwhitton at spwhitton.name>
Date:   Wed Jun 1 10:29:11 2016 +0900

    refresh haskell-servant patch
---
 p/haskell-servant/debian/changelog                |  6 +++++-
 p/haskell-servant/debian/patches/fix-doctest.diff | 26 +++++++++++++----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/p/haskell-servant/debian/changelog b/p/haskell-servant/debian/changelog
index 8205001..0bf47ce 100644
--- a/p/haskell-servant/debian/changelog
+++ b/p/haskell-servant/debian/changelog
@@ -1,8 +1,12 @@
 haskell-servant (0.7.1-1) unstable; urgency=medium
 
+  [ Joachim Breitner ]
   * New upstream release
 
- -- Joachim Breitner <nomeata at debian.org>  Mon, 30 May 2016 17:03:53 +0200
+  [ Sean Whitton ]
+  * Refresh patch.
+
+ -- Sean Whitton <spwhitton at spwhitton.name>  Wed, 01 Jun 2016 10:11:39 +0900
 
 haskell-servant (0.4.4.6-1) unstable; urgency=low
 
diff --git a/p/haskell-servant/debian/patches/fix-doctest.diff b/p/haskell-servant/debian/patches/fix-doctest.diff
index e7a0445..573894a 100644
--- a/p/haskell-servant/debian/patches/fix-doctest.diff
+++ b/p/haskell-servant/debian/patches/fix-doctest.diff
@@ -1,15 +1,19 @@
 --- a/test/Doctests.hs
 +++ b/test/Doctests.hs
-@@ -20,10 +20,10 @@
+@@ -20,14 +20,14 @@ main = do
  
- getCabalMacrosFile :: IO FilePath
+ getCabalMacrosFile :: IO (Maybe FilePath)
  getCabalMacrosFile = do
--  contents <- getDirectoryContents "dist"
-+  contents <- getDirectoryContents "dist-ghc"
-   let rest = "build" </> "autogen" </> "cabal_macros.h"
-   return $ 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"
+-  exists <- doesDirectoryExist "dist"
++  exists <- doesDirectoryExist "dist-ghc"
+   if exists
+     then do
+       contents <- getDirectoryContents "dist"
+       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

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