summaryrefslogtreecommitdiff
path: root/p/haskell-mtl
diff options
context:
space:
mode:
authorClint Adams <clint@debian.org>2016-06-29 16:51:34 +0200
committerClint Adams <clint@debian.org>2016-06-29 16:51:34 +0200
commit274c9878a709dfba172042866178095afb4641aa (patch)
tree49e3bcf7df225cc8a532d9c1c3ac8775356ef197 /p/haskell-mtl
parent641eee5c1744066d2f8a4e2209375be0fffed823 (diff)
parenteadba84308d4c7ee5c208f547e88ceb291931187 (diff)
downloadDHG_packages-274c9878a709dfba172042866178095afb4641aa.tar.gz
Merge remote-tracking branch 'origin/master' into experimental
Diffstat (limited to 'p/haskell-mtl')
-rw-r--r--p/haskell-mtl/debian/changelog8
-rw-r--r--p/haskell-mtl/debian/patches/newer-transformers11
-rw-r--r--p/haskell-mtl/debian/patches/series1
3 files changed, 16 insertions, 4 deletions
diff --git a/p/haskell-mtl/debian/changelog b/p/haskell-mtl/debian/changelog
index a9802629c..f45309866 100644
--- a/p/haskell-mtl/debian/changelog
+++ b/p/haskell-mtl/debian/changelog
@@ -1,14 +1,14 @@
-haskell-mtl (2.2.1-3) UNRELEASED; urgency=medium
+haskell-mtl (2.2.1-3) unstable; urgency=medium
[ Dmitry Bogatov ]
* Use secure (https) uri in Vcs-Git field in 'debian/control'
* Bump standards version to 3.9.8 (no changes needed)
* Convert `debian/copyright' to dep5 format
- [ Gianfranco Costamagna ]
- * Fix VCS fields
+ [ Clint Adams ]
+ * Patch to build with newer transformers (for GHC 8 compatibility).
- -- Dmitry Bogatov <KAction@gnu.org> Tue, 10 May 2016 09:35:49 +0300
+ -- Clint Adams <clint@debian.org> Wed, 29 Jun 2016 14:40:25 +0200
haskell-mtl (2.2.1-2) unstable; urgency=medium
diff --git a/p/haskell-mtl/debian/patches/newer-transformers b/p/haskell-mtl/debian/patches/newer-transformers
new file mode 100644
index 000000000..7b33a1bf6
--- /dev/null
+++ b/p/haskell-mtl/debian/patches/newer-transformers
@@ -0,0 +1,11 @@
+--- a/mtl.cabal
++++ b/mtl.cabal
+@@ -46,7 +46,7 @@ Library
+ Control.Monad.Writer.Class
+ Control.Monad.Writer.Lazy
+ Control.Monad.Writer.Strict
+- build-depends: base < 6, transformers == 0.4.*
++ build-depends: base < 6, transformers >= 0.4 && < 0.6
+ extensions:
+ MultiParamTypeClasses
+ FunctionalDependencies
diff --git a/p/haskell-mtl/debian/patches/series b/p/haskell-mtl/debian/patches/series
new file mode 100644
index 000000000..6f4ff70cc
--- /dev/null
+++ b/p/haskell-mtl/debian/patches/series
@@ -0,0 +1 @@
+newer-transformers