[pkg-haskell-tools] 03/03: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-haskell/pkg-haskell-tools

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository pkg-haskell-tools.

commit 142859e6fbb86d0fe9afc9488e65341eadc95e96
Merge: ca1dd9d 5b82836
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Aug 19 15:56:52 2015 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-haskell/pkg-haskell-tools

 src/make-all.hs | 1 -
 1 file changed, 1 deletion(-)

diff --cc src/make-all.hs
index b312ebb,4fbbb64..3ebf3d1
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@@ -421,8 -401,7 +421,7 @@@ shakeMain conf@(Conf {..}) = d
              map (makeRelative targetDir) <$>
              liftIO (listFiles targetDir)
          let localDepPkgs = map debFileNameToPackage localDebs
- 
 -        withTempDir baseTmpDir $ \tmpdir -> do
 +        withTempDir bindMountDir $ \tmpdir -> do
              -- Now monkey-patch dependencies out of the package lists
              let fixup = tmpdir </> "fixup.sh"
              liftIO $ writeFile fixup  $ fixupScript localDepPkgs

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