Commit Debian 3.0 (quilt) metadatadebian/1.20151215-1.1archive/debian/1.20151215-1.1

[dgit (3.12) quilt-fixup]

1 files changed, 70 insertions, 0 deletions

diff --git a/debian/patches/split-out-module-to-work-around-badly-na.patch b/debian/patches/split-out-module-to-work-around-badly-na.patch
new file mode 100644
index 0000000..a8c3cbb
--- /dev/null
+++ b/debian/patches/split-out-module-to-work-around-badly-na.patch
@@ -0,0 +1,70 @@
+From: Joey Hess <joeyh@joeyh.name>
+Date: Sun, 22 May 2016 15:51:31 -0400
+X-Dgit-Generated: 1.20151215-1.1 e306cd8521a88c1cc39c926177a184adf9524886
+Subject: split out module to work around badly named symbol in directory-1.2.6.2
+
+Sadly my bug report about this is not going to get fixed it seems, so
+I have to drag around a whole added module file just to deal with it.
+
+https://github.com/haskell/directory/issues/52
+
+---
+
+--- git-repair-1.20151215.orig/Utility/Directory.hs
++++ git-repair-1.20151215/Utility/Directory.hs
+@@ -8,10 +8,12 @@
+ {-# LANGUAGE CPP #-}
+ {-# OPTIONS_GHC -fno-warn-tabs #-}
+ 
+-module Utility.Directory where
++module Utility.Directory (
++	module Utility.Directory,
++	module Utility.SystemDirectory
++) where
+ 
+ import System.IO.Error
+-import System.Directory
+ import Control.Monad
+ import System.FilePath
+ import Control.Applicative
+@@ -28,6 +30,7 @@ import Utility.SafeCommand
+ import Control.Monad.IfElse
+ #endif
+ 
++import Utility.SystemDirectory
+ import Utility.PosixFiles
+ import Utility.Tmp
+ import Utility.Exception
+@@ -134,11 +137,13 @@ moveFile src dest = tryIO (rename src de
+ 				_ <- tryIO $ removeFile tmp
+ 				throwM e'
+ 
++#ifndef mingw32_HOST_OS	
+ 	isdir f = do
+ 		r <- tryIO $ getFileStatus f
+ 		case r of
+ 			(Left _) -> return False
+ 			(Right s) -> return $ isDirectory s
++#endif
+ 
+ {- Removes a file, which may or may not exist, and does not have to
+  - be a regular file.
+--- /dev/null
++++ git-repair-1.20151215/Utility/SystemDirectory.hs
+@@ -0,0 +1,16 @@
++{- System.Directory without its conflicting isSymbolicLink
++ -
++ - Copyright 2016 Joey Hess <id@joeyh.name>
++ -
++ - License: BSD-2-clause
++ -}
++
++-- Disable warnings because only some versions of System.Directory export
++-- isSymbolicLink.
++{-# OPTIONS_GHC -fno-warn-tabs -w #-}
++
++module Utility.SystemDirectory (
++	module System.Directory
++) where
++
++import System.Directory hiding (isSymbolicLink)