From b17e6126389b9276bc8c50ea677ca9f2c0b27724 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 25 Jul 2017 17:27:36 -0700 Subject: Commit Debian 3.0 (quilt) metadata [dgit (3.12) quilt-fixup] --- .../patch-common.hs-to-avoid-duplicate-impor.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch (limited to 'debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch') diff --git a/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch b/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch new file mode 100644 index 0000000..bc8aa27 --- /dev/null +++ b/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch @@ -0,0 +1,27 @@ +From: Sean Whitton +Date: Tue, 25 Jul 2017 17:10:10 -0700 +X-Dgit-Generated: 1.20151215-1.1 9d82f181d58f8538247a7efb96d1be16d131c158 +Subject: patch Common.hs to avoid duplicate import errors + + +--- + +--- git-repair-1.20151215.orig/Common.hs ++++ git-repair-1.20151215/Common.hs +@@ -13,7 +13,6 @@ import Data.String.Utils as X hiding (jo + import Data.Monoid as X + + import System.FilePath as X +-import System.Directory as X + import System.IO as X hiding (FilePath) + #ifndef mingw32_HOST_OS + import System.Posix.IO as X hiding (createPipe) +@@ -25,7 +24,7 @@ import Utility.Exception as X + import Utility.SafeCommand as X + import Utility.Process as X + import Utility.Path as X +-import Utility.Directory as X ++import Utility.Directory as X hiding (getFileSize) + import Utility.Monad as X + import Utility.Data as X + import Utility.Applicative as X -- cgit v1.2.3