fix shakespeare patch to build without shakespeare-text

This commit is contained in:
Jens Petersen 2015-09-03 18:11:38 +09:00
parent 8a029c7b84
commit 03c729fc9e
1 changed files with 23 additions and 8 deletions

View File

@ -1,9 +1,6 @@
diff -u -r -U5 hledger-0.24/hledger.cabal hledger-0.24.req-new-shakespeare/hledger.cabal
--- hledger-0.24/hledger.cabal 2014-12-25 14:40:58.000000000 -0500
+++ hledger-0.24.req-new-shakespeare/hledger.cabal 2015-03-01 22:37:43.764811863 -0500
@@ -82,20 +82,11 @@
,parsec >= 3
,process
--- hledger-0.24/hledger.cabal~ 2015-09-03 18:08:49.256055251 +0900
+++ hledger-0.24/hledger.cabal 2015-09-03 18:09:14.827088132 +0900
@@ -84,16 +84,7 @@
,regex-tdfa
,regexpr >= 0.5.1
,safe >= 0.2
@ -21,5 +18,23 @@ diff -u -r -U5 hledger-0.24/hledger.cabal hledger-0.24.req-new-shakespeare/hledg
,split >= 0.1 && < 0.3
,text >= 0.11
,tabular >= 0.2 && < 0.3
,time
,utf8-string >= 0.3.5 && < 0.4
@@ -132,8 +123,7 @@
,regex-tdfa
,regexpr >= 0.5.1
,safe >= 0.2
- ,shakespeare-text >= 1.0 && < 1.2
- ,shakespeare >= 1.0 && < 2.1
+ ,shakespeare >= 2.0 && < 2.1
,split >= 0.1 && < 0.3
,tabular >= 0.2 && < 0.3
,text >= 0.11
@@ -169,8 +159,7 @@
, regex-tdfa
, regexpr
, safe
- , shakespeare-text >= 1.0 && < 1.2
- , shakespeare >= 1.0 && < 2.1
+ , shakespeare >= 2.0 && < 2.1
, split
,tabular >= 0.2 && < 0.3
, test-framework