diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 325ccdf..c23e81a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ git-repair (1.20200102-1) UNRELEASED; urgency=medium - fix-build-with-quickcheck-2.8.2.patch - patch-duplicate-arbitrary-instance-out-o.patch - split-out-module-to-work-around-badly-na.patch. + * Refresh remaining patch, patch-common.hs-to-avoid-duplicate-impor.patch. + Partially applied upstream. * Stop adding upstream entries to debian/changelog. * wrap-and-sort -abst diff --git a/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch b/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch index bc8aa27..3761f70 100644 --- a/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch +++ b/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch @@ -6,17 +6,9 @@ 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 +--- a/Common.hs ++++ b/Common.hs +@@ -26,7 +25,7 @@ import Utility.Exception as X import Utility.SafeCommand as X import Utility.Process as X import Utility.Path as X |