summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2020-01-02 18:21:49 +0000
committerSean Whitton <spwhitton@spwhitton.name>2020-01-02 18:26:01 +0000
commit1502c15352235371946db877a55da739d5fb7580 (patch)
tree72053d3c14c8e6cfa38b80c890969d734773bc0e
parent82194f4c43cd5055d964b60a7c4244376e20f5af (diff)
downloadgit-repair-1502c15352235371946db877a55da739d5fb7580.tar.gz
refresh remaining patch
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch14
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