aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Annex/Fixup.hs2
-rw-r--r--Assistant/Install/AutoStart.hs2
-rw-r--r--Build/Configure.hs2
-rw-r--r--Build/DesktopFile.hs2
-rw-r--r--Build/EvilLinker.hs2
-rw-r--r--Build/EvilSplicer.hs2
-rw-r--r--Build/LinuxMkLibs.hs2
-rw-r--r--Build/NullSoftInstaller.hs2
-rw-r--r--Build/OSXMkLibs.hs2
-rw-r--r--Build/Standalone.hs2
-rw-r--r--Build/TestConfig.hs2
-rw-r--r--Build/Version.hs2
-rw-r--r--Common.hs2
-rw-r--r--Setup.hs2
-rw-r--r--Utility/Directory.hs2
-rw-r--r--Utility/FreeDesktop.hs2
-rw-r--r--Utility/LinuxMkLibs.hs2
-rw-r--r--Utility/LockFile/PidLock.hs2
-rw-r--r--Utility/Path.hs2
-rw-r--r--Utility/Tmp.hs2
-rw-r--r--debian/changelog6
21 files changed, 26 insertions, 20 deletions
diff --git a/Annex/Fixup.hs b/Annex/Fixup.hs
index 1cde86390..35634f14c 100644
--- a/Annex/Fixup.hs
+++ b/Annex/Fixup.hs
@@ -20,7 +20,7 @@ import Utility.Exception
import System.IO
import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Data.List
import Control.Monad
import Control.Monad.IfElse
diff --git a/Assistant/Install/AutoStart.hs b/Assistant/Install/AutoStart.hs
index 57450304b..b2799101b 100644
--- a/Assistant/Install/AutoStart.hs
+++ b/Assistant/Install/AutoStart.hs
@@ -14,7 +14,7 @@ import Utility.FreeDesktop
#ifdef darwin_HOST_OS
import Utility.OSX
import Utility.Path
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
#endif
installAutoStart :: FilePath -> FilePath -> IO ()
diff --git a/Build/Configure.hs b/Build/Configure.hs
index 55f2493a1..f0c3f7c33 100644
--- a/Build/Configure.hs
+++ b/Build/Configure.hs
@@ -4,7 +4,7 @@
module Build.Configure where
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Control.Applicative
import System.Environment (getArgs)
import Control.Monad.IfElse
diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs
index cac520d77..f832f310c 100644
--- a/Build/DesktopFile.hs
+++ b/Build/DesktopFile.hs
@@ -20,7 +20,7 @@ import Utility.OSX
import Assistant.Install.AutoStart
import Assistant.Install.Menu
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import System.Environment
#ifndef mingw32_HOST_OS
import System.Posix.User
diff --git a/Build/EvilLinker.hs b/Build/EvilLinker.hs
index 97f218fd5..37885296f 100644
--- a/Build/EvilLinker.hs
+++ b/Build/EvilLinker.hs
@@ -15,7 +15,7 @@ import Text.Parsec
import Text.Parsec.String
import Control.Applicative ((<$>))
import Control.Monad
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Data.Maybe
import Data.List
diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs
index 9734b7411..dc71a992c 100644
--- a/Build/EvilSplicer.hs
+++ b/Build/EvilSplicer.hs
@@ -39,7 +39,7 @@ import Data.String.Utils
import Data.Char
import System.Environment
import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import System.IO
import Control.Monad
import Prelude hiding (log)
diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs
index 5c33d4956..81cf834ef 100644
--- a/Build/LinuxMkLibs.hs
+++ b/Build/LinuxMkLibs.hs
@@ -12,7 +12,7 @@ module Main where
import System.Environment
import Data.Maybe
import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Control.Monad
import Data.List
import System.Posix.Files
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs
index 7af6babef..b8c988062 100644
--- a/Build/NullSoftInstaller.hs
+++ b/Build/NullSoftInstaller.hs
@@ -21,7 +21,7 @@
{-# LANGUAGE OverloadedStrings, FlexibleContexts #-}
import Development.NSIS
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import System.FilePath
import Control.Monad
import Control.Applicative
diff --git a/Build/OSXMkLibs.hs b/Build/OSXMkLibs.hs
index c23f4a321..8be73babe 100644
--- a/Build/OSXMkLibs.hs
+++ b/Build/OSXMkLibs.hs
@@ -10,7 +10,7 @@ module Main where
import System.Environment (getArgs)
import Data.Maybe
import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Control.Monad
import Control.Monad.IfElse
import Data.List
diff --git a/Build/Standalone.hs b/Build/Standalone.hs
index a3a4bac48..48e96f952 100644
--- a/Build/Standalone.hs
+++ b/Build/Standalone.hs
@@ -12,7 +12,7 @@ module Main where
import Control.Monad.IfElse
import System.Environment
import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Control.Monad
import Build.BundledPrograms
diff --git a/Build/TestConfig.hs b/Build/TestConfig.hs
index 35daf1945..b7766d6c4 100644
--- a/Build/TestConfig.hs
+++ b/Build/TestConfig.hs
@@ -10,7 +10,7 @@ import Utility.SafeCommand
import System.IO
import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
type ConfigKey = String
data ConfigValue =
diff --git a/Build/Version.hs b/Build/Version.hs
index 5954de169..fb6366688 100644
--- a/Build/Version.hs
+++ b/Build/Version.hs
@@ -6,7 +6,7 @@ module Build.Version where
import Data.List
import System.Environment
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Data.Char
import System.Process
import Control.Applicative
diff --git a/Common.hs b/Common.hs
index 2b8b9a805..8cec490b1 100644
--- a/Common.hs
+++ b/Common.hs
@@ -14,7 +14,7 @@ import Data.Monoid as X
import Data.Default as X
import System.FilePath as X
-import System.Directory as X
+import System.Directory as X hiding (isSymbolicLink)
import System.IO as X hiding (FilePath)
#ifndef mingw32_HOST_OS
import System.Posix.IO as X hiding (createPipe)
diff --git a/Setup.hs b/Setup.hs
index 0684674b3..26805bc13 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -12,7 +12,7 @@ import Distribution.Verbosity (Verbosity)
import System.FilePath
import Control.Applicative
import Control.Monad
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Data.List
import Control.Exception
diff --git a/Utility/Directory.hs b/Utility/Directory.hs
index fa9d14ff0..bc24828fb 100644
--- a/Utility/Directory.hs
+++ b/Utility/Directory.hs
@@ -11,7 +11,7 @@
module Utility.Directory where
import System.IO.Error
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Control.Monad
import System.FilePath
import Control.Applicative
diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs
index f8b9fd709..78c103528 100644
--- a/Utility/FreeDesktop.hs
+++ b/Utility/FreeDesktop.hs
@@ -35,7 +35,7 @@ import Utility.Process
import Utility.PartialPrelude
import System.Environment
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import System.FilePath
import Data.List
import Data.String.Utils
diff --git a/Utility/LinuxMkLibs.hs b/Utility/LinuxMkLibs.hs
index fdeb77959..016053303 100644
--- a/Utility/LinuxMkLibs.hs
+++ b/Utility/LinuxMkLibs.hs
@@ -14,7 +14,7 @@ import Utility.Monad
import Utility.Path
import Data.Maybe
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import System.FilePath
import Data.List.Utils
import System.Posix.Files
diff --git a/Utility/LockFile/PidLock.hs b/Utility/LockFile/PidLock.hs
index a21014c0e..50c38d70c 100644
--- a/Utility/LockFile/PidLock.hs
+++ b/Utility/LockFile/PidLock.hs
@@ -34,7 +34,7 @@ import Data.List
import Network.BSD
import System.FilePath
import Data.Hash.MD5
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Control.Applicative
import Prelude
diff --git a/Utility/Path.hs b/Utility/Path.hs
index e44975a1e..729300c43 100644
--- a/Utility/Path.hs
+++ b/Utility/Path.hs
@@ -12,7 +12,7 @@ module Utility.Path where
import Data.String.Utils
import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Data.List
import Data.Maybe
import Data.Char
diff --git a/Utility/Tmp.hs b/Utility/Tmp.hs
index 7610f6cc8..11bab027d 100644
--- a/Utility/Tmp.hs
+++ b/Utility/Tmp.hs
@@ -11,7 +11,7 @@
module Utility.Tmp where
import System.IO
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import Control.Monad.IfElse
import System.FilePath
import Control.Monad.IO.Class
diff --git a/debian/changelog b/debian/changelog
index 86986ab26..f24c11da4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (6.20160420) UNRELEASED; urgency=medium
+
+ * Fix build with directory-1.2.6.2.
+
+ -- Joey Hess <id@joeyh.name> Thu, 28 Apr 2016 13:17:04 -0400
+
git-annex (6.20160419) unstable; urgency=medium
* Fix bug that prevented resuming of uploads to encrypted special remotes
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 12:00:12 +0000