[DHG_packages] 01/01: patch away use of mtl-compat
Clint Adams
clint at moszumanska.debian.org
Sat Dec 5 06:54:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch master
in repository DHG_packages.
commit 203373e6f436dc06d7b7dfb10b2b6222c2b42a2d
Author: Clint Adams <clint at debian.org>
Date: Sat Dec 5 01:53:51 2015 -0500
patch away use of mtl-compat
---
p/haskell-haxr/debian/control | 5 +---
p/haskell-haxr/debian/patches/no-mtl-compat | 12 ++++++++
p/haskell-haxr/debian/patches/series | 1 +
p/haskell-hledger-lib/debian/control | 5 +---
p/haskell-hledger-lib/debian/patches/no-mtl-compat | 22 +++++++++++++++
p/haskell-hledger-lib/debian/patches/series | 1 +
p/haskell-hledger/debian/control | 5 +---
p/haskell-hledger/debian/patches/no-mtl-compat | 32 ++++++++++++++++++++++
p/haskell-hledger/debian/patches/series | 1 +
9 files changed, 72 insertions(+), 12 deletions(-)
diff --git a/p/haskell-haxr/debian/control b/p/haskell-haxr/debian/control
index 88e02d8..539da88 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 0000000..f50af19
--- /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 0000000..cc4c0b8
--- /dev/null
+++ b/p/haskell-haxr/debian/patches/series
@@ -0,0 +1 @@
+no-mtl-compat
diff --git a/p/haskell-hledger-lib/debian/control b/p/haskell-hledger-lib/debian/control
index cdece22..dd61c5f 100644
--- a/p/haskell-hledger-lib/debian/control
+++ b/p/haskell-hledger-lib/debian/control
@@ -21,10 +21,8 @@ Build-Depends: debhelper (>= 9),
libghc-cmdargs-prof,
libghc-csv-dev,
libghc-csv-prof,
- libghc-mtl-dev,
+ libghc-mtl-dev (>= 2.2.1),
libghc-mtl-prof,
- libghc-mtl-compat-dev,
- libghc-mtl-compat-prof,
libghc-old-time-dev,
libghc-old-time-prof,
libghc-parsec3-dev (>= 3),
@@ -49,7 +47,6 @@ Build-Depends-Indep: ghc-doc,
libghc-cmdargs-doc,
libghc-csv-doc,
libghc-mtl-doc,
- libghc-mtl-compat-doc,
libghc-old-time-doc,
libghc-parsec3-doc,
libghc-pretty-show-doc,
diff --git a/p/haskell-hledger-lib/debian/patches/no-mtl-compat b/p/haskell-hledger-lib/debian/patches/no-mtl-compat
new file mode 100644
index 0000000..d820ace
--- /dev/null
+++ b/p/haskell-hledger-lib/debian/patches/no-mtl-compat
@@ -0,0 +1,22 @@
+--- a/hledger-lib.cabal
++++ b/hledger-lib.cabal
+@@ -100,8 +100,7 @@
+ ,Decimal
+ ,directory
+ ,filepath
+- ,mtl
+- ,mtl-compat
++ ,mtl >= 2.2.1
+ ,old-time
+ ,parsec >= 3
+ ,regex-tdfa
+@@ -138,8 +137,7 @@
+ , directory
+ , filepath
+ , HUnit
+- , mtl
+- , mtl-compat
++ , mtl >= 2.2.1
+ , old-time
+ , parsec >= 3
+ , regex-tdfa
diff --git a/p/haskell-hledger-lib/debian/patches/series b/p/haskell-hledger-lib/debian/patches/series
new file mode 100644
index 0000000..cc4c0b8
--- /dev/null
+++ b/p/haskell-hledger-lib/debian/patches/series
@@ -0,0 +1 @@
+no-mtl-compat
diff --git a/p/haskell-hledger/debian/control b/p/haskell-hledger/debian/control
index 3d9a65a..48bc247 100644
--- a/p/haskell-hledger/debian/control
+++ b/p/haskell-hledger/debian/control
@@ -21,10 +21,8 @@ Build-Depends: debhelper (>= 9),
libghc-hledger-lib-dev (>= 0.26),
libghc-hledger-lib-dev (<< 0.27),
libghc-hledger-lib-prof,
- libghc-mtl-dev,
+ libghc-mtl-dev (>= 2.2.1),
libghc-mtl-prof,
- libghc-mtl-compat-dev,
- libghc-mtl-compat-prof,
libghc-parsec3-dev (>= 3),
libghc-parsec3-prof,
libghc-pretty-show-dev (>= 1.6.4),
@@ -59,7 +57,6 @@ Build-Depends-Indep: ghc-doc,
libghc-csv-doc,
libghc-hledger-lib-doc,
libghc-mtl-doc,
- libghc-mtl-compat-doc,
libghc-parsec3-doc,
libghc-pretty-show-doc,
libghc-regex-tdfa-doc,
diff --git a/p/haskell-hledger/debian/patches/no-mtl-compat b/p/haskell-hledger/debian/patches/no-mtl-compat
new file mode 100644
index 0000000..4cdd992
--- /dev/null
+++ b/p/haskell-hledger/debian/patches/no-mtl-compat
@@ -0,0 +1,32 @@
+--- a/hledger.cabal
++++ b/hledger.cabal
+@@ -82,8 +82,7 @@
+ ,filepath
+ ,haskeline >= 0.6 && <= 0.8
+ ,HUnit
+- ,mtl
+- ,mtl-compat
++ ,mtl >= 2.2.1
+ ,old-time
+ ,parsec >= 3
+ ,process
+@@ -137,8 +136,7 @@
+ ,filepath
+ ,haskeline >= 0.6 && <= 0.8
+ ,HUnit
+- ,mtl
+- ,mtl-compat
++ ,mtl >= 2.2.1
+ ,old-time
+ ,parsec >= 3
+ ,process
+@@ -184,8 +182,7 @@
+ , filepath
+ , haskeline
+ , HUnit
+- , mtl
+- , mtl-compat
++ , mtl >= 2.2.1
+ , old-time
+ , parsec >= 3
+ , process
diff --git a/p/haskell-hledger/debian/patches/series b/p/haskell-hledger/debian/patches/series
new file mode 100644
index 0000000..cc4c0b8
--- /dev/null
+++ b/p/haskell-hledger/debian/patches/series
@@ -0,0 +1 @@
+no-mtl-compat
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list