patch away use of mtl-compat

3 files changed, 14 insertions, 4 deletions

diff --git a/p/haskell-haxr/debian/control b/p/haskell-haxr/debian/control
index 88e02d870..539da8809 100644
--- a/p/haskell-haxr/debian/control
+++ b/p/haskell-haxr/debian/control
@@ -28,10 +28,8 @@ Build-Depends: debhelper (>= 9),
  libghc-http-types-prof,
  libghc-io-streams-dev,
  libghc-io-streams-prof,
- libghc-mtl-dev,
+ libghc-mtl-dev (>= 2.2.1),
  libghc-mtl-prof,
- libghc-mtl-compat-dev,
- libghc-mtl-compat-prof,
  libghc-network-dev (>= 2.6),
  libghc-network-dev (<< 2.7),
  libghc-network-prof,
@@ -53,7 +51,6 @@ Build-Depends-Indep: ghc-doc,
  libghc-http-types-doc,
  libghc-io-streams-doc,
  libghc-mtl-doc,
- libghc-mtl-compat-doc,
  libghc-network-doc,
  libghc-network-uri-doc,
  libghc-old-locale-doc,
diff --git a/p/haskell-haxr/debian/patches/no-mtl-compat b/p/haskell-haxr/debian/patches/no-mtl-compat
new file mode 100644
index 000000000..f50af199d
--- /dev/null
+++ b/p/haskell-haxr/debian/patches/no-mtl-compat
@@ -0,0 +1,12 @@
+--- a/haxr.cabal
++++ b/haxr.cabal
+@@ -34,8 +34,7 @@
+ Library
+   Build-depends: base < 5,
+                  base-compat >= 0.8 && < 0.9,
+-                 mtl,
+-                 mtl-compat,
++                 mtl >= 2.2.1,
+                  network < 2.7,
+                  http-streams,
+                  HsOpenSSL,
diff --git a/p/haskell-haxr/debian/patches/series b/p/haskell-haxr/debian/patches/series
new file mode 100644
index 000000000..cc4c0b85a
--- /dev/null
+++ b/p/haskell-haxr/debian/patches/series
@@ -0,0 +1 @@
+no-mtl-compat