From 08e8adaf016280d2dd4ddb180474fa183a8e1008 Mon Sep 17 00:00:00 2001
From: Antoine Latter <aslatter@gmail.com>
Date: Thu, 22 Dec 2011 16:47:13 -0500
Subject: [PATCH 1/2] Update build depends for GHC 7.4
---
pandoc.cabal | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pandoc.cabal b/pandoc.cabal
index d6eb33d41..d60636518 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -204,13 +204,13 @@ Library
blaze-html >= 0.4.3.0 && < 0.5,
mtl >= 1.1 && < 2.1,
network >= 2 && < 2.4,
- filepath >= 1.1 && < 1.3,
+ filepath >= 1.1 && < 1.4,
process >= 1 && < 1.2,
directory >= 1 && < 1.2,
bytestring >= 0.9 && < 1.0,
zip-archive >= 0.1.1.7 && < 0.2,
utf8-string >= 0.3 && < 0.4,
- old-time >= 1 && < 1.1,
+ old-time >= 1 && < 1.2,
HTTP >= 4000.0.5 && < 4000.3,
texmath >= 0.5 && < 0.6,
xml >= 1.3.5 && < 1.4,
@@ -290,13 +290,13 @@ Executable pandoc
blaze-html >= 0.4.3.0 && < 0.5,
mtl >= 1.1 && < 2.1,
network >= 2 && < 2.4,
- filepath >= 1.1 && < 1.3,
+ filepath >= 1.1 && < 1.4,
process >= 1 && < 1.2,
directory >= 1 && < 1.2,
bytestring >= 0.9 && < 1.0,
zip-archive >= 0.1.1.7 && < 0.2,
utf8-string >= 0.3 && < 0.4,
- old-time >= 1 && < 1.1,
+ old-time >= 1 && < 1.2,
HTTP >= 4000.0.5 && < 4000.3,
texmath >= 0.5 && < 0.6,
xml >= 1.3.5 && < 1.4,
From 1c854ea5c385fa50a13260356bbec99a974c09de Mon Sep 17 00:00:00 2001
From: Antoine Latter <aslatter@gmail.com>
Date: Thu, 22 Dec 2011 17:24:24 -0500
Subject: [PATCH 2/2] tests: update package description to build with GHC 7.4
---
pandoc.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pandoc.cabal b/pandoc.cabal
index d60636518..b05c4bbd3 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -363,7 +363,7 @@ Executable test-pandoc
test-framework-quickcheck2 >= 0.2.9 && < 0.3,
QuickCheck >= 2.4 && < 2.6,
HUnit >= 1.2 && < 1.3,
- template-haskell >= 2.4 && < 2.7,
+ template-haskell >= 2.4 && < 2.8,
ansi-terminal == 0.5.*
Other-Modules: Tests.Old
Tests.Helpers