[DHG_packages] 06/21: Refine servent patch

Joachim Breitner nomeata at moszumanska.debian.org
Wed Jun 1 09:05:38 UTC 2016


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

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

commit 48e54d67c275fa99bcbcbfbf236dc5ddb924778a
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Jun 1 10:25:16 2016 +0200

    Refine servent patch
---
 p/haskell-servant/debian/patches/fix-doctest.diff | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/p/haskell-servant/debian/patches/fix-doctest.diff b/p/haskell-servant/debian/patches/fix-doctest.diff
index 573894a..b775978 100644
--- a/p/haskell-servant/debian/patches/fix-doctest.diff
+++ b/p/haskell-servant/debian/patches/fix-doctest.diff
@@ -1,6 +1,8 @@
---- a/test/Doctests.hs
-+++ b/test/Doctests.hs
-@@ -20,14 +20,14 @@ main = do
+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
@@ -8,7 +10,8 @@
 +  exists <- doesDirectoryExist "dist-ghc"
    if exists
      then do
-       contents <- getDirectoryContents "dist"
+-      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

-- 
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