summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2017-09-03 19:23:08 -0700
committerSean Whitton <spwhitton@spwhitton.name>2017-09-03 19:23:08 -0700
commit4bdaa336b6be2b3289a89625880243d10667f24d (patch)
treef026bc3b5e45e6a27b928933e2121ab9f2f7c745
parent9c669eeb015abcc0e914511b913ec78083d5e79e (diff)
downloadDHG_packages-4bdaa336b6be2b3289a89625880243d10667f24d.tar.gz
primitive: drop patch merged upstream
-rw-r--r--p/haskell-primitive/debian/changelog3
-rw-r--r--p/haskell-primitive/debian/patches/newer-base-and-ghc-prim-and-transformers15
-rw-r--r--p/haskell-primitive/debian/patches/series1
3 files changed, 2 insertions, 17 deletions
diff --git a/p/haskell-primitive/debian/changelog b/p/haskell-primitive/debian/changelog
index 720c3c91a..2913e3486 100644
--- a/p/haskell-primitive/debian/changelog
+++ b/p/haskell-primitive/debian/changelog
@@ -1,8 +1,9 @@
haskell-primitive (0.6.2.0-1) unstable; urgency=medium
* New upstream release
+ * Drop patch; merged upstream.
- -- Sean Whitton <spwhitton@spwhitton.name> Sun, 03 Sep 2017 13:58:19 -0700
+ -- Sean Whitton <spwhitton@spwhitton.name> Sun, 03 Sep 2017 19:22:59 -0700
haskell-primitive (0.6.1.0-4) unstable; urgency=medium
diff --git a/p/haskell-primitive/debian/patches/newer-base-and-ghc-prim-and-transformers b/p/haskell-primitive/debian/patches/newer-base-and-ghc-prim-and-transformers
deleted file mode 100644
index 89c8f5ef3..000000000
--- a/p/haskell-primitive/debian/patches/newer-base-and-ghc-prim-and-transformers
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/primitive.cabal
-+++ b/primitive.cabal
-@@ -36,9 +36,9 @@ Library
- Data.Primitive.Internal.Compat
- Data.Primitive.Internal.Operations
-
-- Build-Depends: base >= 4.3 && < 4.9
-- , ghc-prim >= 0.2 && < 0.5
-- , transformers >= 0.2 && < 0.5
-+ Build-Depends: base >= 4.3 && < 4.10
-+ , ghc-prim >= 0.2 && < 0.6
-+ , transformers >= 0.2 && < 0.6
-
- Ghc-Options: -O2 -Wall
-
diff --git a/p/haskell-primitive/debian/patches/series b/p/haskell-primitive/debian/patches/series
deleted file mode 100644
index 8b5cefbcb..000000000
--- a/p/haskell-primitive/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-base-and-ghc-prim-and-transformers