summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2020-01-02 18:34:57 +0000
committerSean Whitton <spwhitton@spwhitton.name>2020-01-02 18:40:18 +0000
commit2468e746eb323248c1055c84dd2430e4a7b09b35 (patch)
tree006257886e2e667b55b8873350d00ca347fa11f7
parent6dd45ad8f1a8503480429de9decffb540e997a24 (diff)
downloadgit-repair-2468e746eb323248c1055c84dd2430e4a7b09b35.tar.gz
drop remaining patch
-rw-r--r--Common.hs2
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch19
-rw-r--r--debian/patches/series1
4 files changed, 3 insertions, 27 deletions
diff --git a/Common.hs b/Common.hs
index 7976789..6bd2e7a 100644
--- a/Common.hs
+++ b/Common.hs
@@ -25,7 +25,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 hiding (getFileSize)
+import Utility.Directory as X
import Utility.Monad as X
import Utility.Data as X
import Utility.Applicative as X
diff --git a/debian/changelog b/debian/changelog
index d805a86..3a5bd32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,8 @@ git-repair (1.20200102-1) UNRELEASED; urgency=medium
- Tighten build-dep on optparse-applicative
- Add build-deps on split, filepath-bytestring, attoparsec, data-default
- Drop build-dep on missingh.
- * Drop patches merged upstream:
- - 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.
+ * Drop all patches.
+ Either merged upstream or obsoleted by upstream changes.
* d/copyright updates:
- Main project license is now AGPL-3+
- Add stanza for Utility/Attoparsec.hs
diff --git a/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch b/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch
deleted file mode 100644
index 3761f70..0000000
--- a/debian/patches/patch-common.hs-to-avoid-duplicate-impor.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Sean Whitton <spwhitton@spwhitton.name>
-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
-
-
----
-
---- 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
--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
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 621573e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-patch-common.hs-to-avoid-duplicate-impor.patch