[Pkg-haskell-commits] [package-plan] 01/01: Plan shakespeare 2.0 update
Joachim Breitner
nomeata at moszumanska.debian.org
Thu Jul 10 08:48:49 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch shakespeare
in repository package-plan.
commit 3023dd1cac23c72ddd292644e867a30bbe1a901c
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Thu Jul 10 10:48:24 2014 +0200
Plan shakespeare 2.0 update
which makes a few packages obsolete, these need to be patched out
---
packages.txt | 18 +++++-----
patches/Agda/2.4.0.1/binary-0.5.patch | 13 +++++++
patches/Agda/2.4.0.1/series | 1 +
patches/hledger-web/0.23.2/series | 1 +
patches/hledger-web/0.23.2/shakespeare-2.0.patch | 34 ++++++++++++++++++
patches/hledger/0.23.2/series | 1 +
patches/hledger/0.23.2/shakespeare-2.0.patch | 42 ++++++++++++++++++++++
patches/notmuch-web/0.2.0/series | 1 +
patches/notmuch-web/0.2.0/shakespeare-2.0.patch | 22 ++++++++++++
patches/process-conduit/1.1.0.0/series | 1 +
.../process-conduit/1.1.0.0/shakespeare-2.0.patch | 14 ++++++++
.../yesod-auth/1.3.1.1/no-attoparsec-conduit.diff | 12 +++++++
patches/yesod-auth/{1.3.1 => 1.3.1.1}/series | 1 +
patches/yesod-auth/1.3.1.1/shakespeare-2.0.patch | 16 +++++++++
.../yesod-auth/1.3.1/no-attoparsec-conduit.diff | 10 ------
.../{1.2.10.2 => 1.2.11}/no-network-conduit.diff | 0
patches/yesod-bin/{1.2.10.2 => 1.2.11}/series | 1 +
patches/yesod-bin/1.2.11/shakespeare-2.0.patch | 17 +++++++++
...-attoparsec-conduit-and-no-network-conduit.diff | 10 +++---
patches/yesod-core/1.2.16.1/no-wai-test.diff | 10 +++---
patches/yesod-core/1.2.16.1/series | 1 +
patches/yesod-core/1.2.16.1/shakespeare-2.0.patch | 27 ++++++++++++++
patches/yesod-form/1.3.10/series | 1 +
patches/yesod-form/1.3.10/shakespeare-2.0.patch | 16 +++++++++
patches/yesod-markdown/0.8.2/series | 1 +
patches/yesod-markdown/0.8.2/shakespeare-2.0.patch | 13 +++++++
patches/yesod-newsfeed/1.2.0.2/series | 1 +
.../yesod-newsfeed/1.2.0.2/shakespeare-2.0.patch | 14 ++++++++
patches/yesod-static/1.2.4/series | 1 +
patches/yesod-static/1.2.4/shakespeare-2.0.patch | 22 ++++++++++++
patches/yesod/1.2.6/no-network-conduit.diff | 8 +++--
patches/yesod/1.2.6/series | 1 +
patches/yesod/1.2.6/shakespeare-2.0.patch | 15 ++++++++
33 files changed, 316 insertions(+), 30 deletions(-)
diff --git a/packages.txt b/packages.txt
index c5a77fc..7b3948e 100644
--- a/packages.txt
+++ b/packages.txt
@@ -246,7 +246,7 @@ gtksourceview2 0.12.3.1
gtk-traymanager 0.1.3
haddock 2.13.1
hakyll 4.5.3.0
-hamlet 1.1.9.2
+hamlet 1.2.0 obsolete
happstack 7.0.1
happstack-authenticate 0.10.12
happstack-heist 7.2.3
@@ -518,7 +518,7 @@ reducers 3.10.1.1
reflection 1.2.0.1
reform 0.2.0
reform-blaze 0.2.0
-reform-hamlet 0.0
+reform-hamlet 0.0.3
reform-happstack 0.2.0
reform-hsp 0.2.0
regex-base 0.93.2
@@ -555,11 +555,11 @@ setlocale 0.0.3
sfml-audio 0.7.0.1816
SHA 1.6.1
shake 0.13.2
-shakespeare 1.2.1.1
-shakespeare-css 1.0.7.4
-shakespeare-i18n 1.0.0.5
-shakespeare-js 1.2.0.4
-shakespeare-text 1.0.2
+shakespeare 2.0.1
+shakespeare-css 1.1.0 obsolete
+shakespeare-i18n 1.0.0.5 obsolete
+shakespeare-js 1.2.0.4 obsolete
+shakespeare-text 1.1.0 obsolete
Shellac 0.9.5.1
ShellCheck 0.3.3 binary=shellcheck
shelltestrunner 1.3.2 binary
@@ -713,10 +713,10 @@ xss-sanitize 0.3.4
yaml 0.8.8.3
yaml-light 0.1.4
yesod 1.2.6
-yesod-auth 1.3.1
+yesod-auth 1.3.1.1
yesod-auth-account 1.2.6
yesod-auth-oauth 1.2.0
-yesod-bin 1.2.10.2 binary=yesod
+yesod-bin 1.2.11 binary=yesod
yesod-core 1.2.16.1
yesod-default 1.2.0
yesod-form 1.3.10
diff --git a/patches/Agda/2.4.0.1/binary-0.5.patch b/patches/Agda/2.4.0.1/binary-0.5.patch
new file mode 100644
index 0000000..ee4e2d9
--- /dev/null
+++ b/patches/Agda/2.4.0.1/binary-0.5.patch
@@ -0,0 +1,13 @@
+Index: Agda-2.4.0.1/Agda.cabal
+===================================================================
+--- Agda-2.4.0.1.orig/Agda.cabal 2014-06-23 21:39:50.001764262 -0700
++++ Agda-2.4.0.1/Agda.cabal 2014-06-23 21:40:11.381763429 -0700
+@@ -83,7 +83,7 @@
+ pretty >= 1.0 && < 1.2,
+ bytestring >= 0.9.0.1 && < 0.11,
+ array >= 0.1 && < 0.6,
+- binary >= 0.6 && < 0.8,
++ binary >= 0.5 && < 0.8,
+ zlib >= 0.4.0.1 && < 0.6,
+ filepath >= 1.1 && < 1.4,
+ process >= 1.0.1.0 && < 1.3,
diff --git a/patches/Agda/2.4.0.1/series b/patches/Agda/2.4.0.1/series
new file mode 100644
index 0000000..5da7a94
--- /dev/null
+++ b/patches/Agda/2.4.0.1/series
@@ -0,0 +1 @@
+binary-0.5.patch
diff --git a/patches/hledger-web/0.23.2/series b/patches/hledger-web/0.23.2/series
index 7701a28..1cb43fd 100644
--- a/patches/hledger-web/0.23.2/series
+++ b/patches/hledger-web/0.23.2/series
@@ -1,2 +1,3 @@
no-network-conduit.diff
newer-wai.diff
+shakespeare-2.0.patch
diff --git a/patches/hledger-web/0.23.2/shakespeare-2.0.patch b/patches/hledger-web/0.23.2/shakespeare-2.0.patch
new file mode 100644
index 0000000..0b4d5e1
--- /dev/null
+++ b/patches/hledger-web/0.23.2/shakespeare-2.0.patch
@@ -0,0 +1,34 @@
+Index: hledger-web-0.23.2/hledger-web.cabal
+===================================================================
+--- hledger-web-0.23.2.orig/hledger-web.cabal 2014-07-10 10:07:38.681207200 +0200
++++ hledger-web-0.23.2/hledger-web.cabal 2014-07-10 10:21:52.581176294 +0200
+@@ -132,17 +132,7 @@
+ , parsec
+ , regexpr >= 0.5.1
+ , safe >= 0.2
+--- http://www.yesodweb.com/blog/2014/04/consolidation-progress
+--- in order to support both the old and new versions of shakespeare,
+--- you just need to ensure that you have both the shakespeare and
+--- deprecated packages listed in your cabal file. In other words, if
+--- previously you depended on hamlet, now you should depend on hamlet
+--- and shakespeare. When you're ready to drop backwards compatibility,
+--- simply put a lower bound of >= 2.0 on shakespeare and remove the
+--- deprecated packages.
+- , hamlet
+- , shakespeare-text >= 1.0 && < 1.2
+- , shakespeare >= 1.0 && < 2.1
++ , shakespeare >= 2.0 && < 2.1
+ , template-haskell
+ , text
+ , time
+@@ -231,9 +221,7 @@
+ , parsec
+ , regexpr >= 0.5.1
+ , safe >= 0.2
+- , hamlet
+- , shakespeare-text >= 1.0 && < 1.2
+- , shakespeare >= 1.0 && < 2.1
++ , shakespeare >= 2.0 && < 2.1
+ , template-haskell
+ , text
+ , time
diff --git a/patches/hledger/0.23.2/series b/patches/hledger/0.23.2/series
new file mode 100644
index 0000000..6fddf25
--- /dev/null
+++ b/patches/hledger/0.23.2/series
@@ -0,0 +1 @@
+shakespeare-2.0.patch
diff --git a/patches/hledger/0.23.2/shakespeare-2.0.patch b/patches/hledger/0.23.2/shakespeare-2.0.patch
new file mode 100644
index 0000000..31b3311
--- /dev/null
+++ b/patches/hledger/0.23.2/shakespeare-2.0.patch
@@ -0,0 +1,42 @@
+Index: hledger-0.23.2/hledger.cabal
+===================================================================
+--- hledger-0.23.2.orig/hledger.cabal 2014-07-10 10:12:52.049195858 +0200
++++ hledger-0.23.2/hledger.cabal 2014-07-10 10:13:08.705195255 +0200
+@@ -82,16 +82,7 @@
+ ,process
+ ,regexpr >= 0.5.1
+ ,safe >= 0.2
+--- http://www.yesodweb.com/blog/2014/04/consolidation-progress
+--- in order to support both the old and new versions of shakespeare,
+--- you just need to ensure that you have both the shakespeare and
+--- deprecated packages listed in your cabal file. In other words, if
+--- previously you depended on hamlet, now you should depend on hamlet
+--- and shakespeare. When you're ready to drop backwards compatibility,
+--- simply put a lower bound of >= 2.0 on shakespeare and remove the
+--- deprecated packages.
+- ,shakespeare-text >= 1.0 && < 1.2
+- ,shakespeare >= 1.0 && < 2.1
++ ,shakespeare >= 2.0 && < 2.1
+ ,split >= 0.1 && < 0.3
+ ,text >= 0.11 && < 1.2
+ ,tabular >= 0.2 && < 0.3
+@@ -151,8 +142,7 @@
+ ,process
+ ,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 && < 1.2
+@@ -185,8 +175,7 @@
+ , process
+ , 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
diff --git a/patches/notmuch-web/0.2.0/series b/patches/notmuch-web/0.2.0/series
index e9443ab..bcf619f 100644
--- a/patches/notmuch-web/0.2.0/series
+++ b/patches/notmuch-web/0.2.0/series
@@ -2,3 +2,4 @@ testsuite-http-code
config-in-etc
no-attoparsec-conduit.diff
newer-resourcet.diff
+shakespeare-2.0.patch
diff --git a/patches/notmuch-web/0.2.0/shakespeare-2.0.patch b/patches/notmuch-web/0.2.0/shakespeare-2.0.patch
new file mode 100644
index 0000000..6a2680e
--- /dev/null
+++ b/patches/notmuch-web/0.2.0/shakespeare-2.0.patch
@@ -0,0 +1,22 @@
+Index: notmuch-web-0.2.0/notmuch-web.cabal
+===================================================================
+--- notmuch-web-0.2.0.orig/notmuch-web.cabal 2014-07-10 10:25:13.805169011 +0200
++++ notmuch-web-0.2.0/notmuch-web.cabal 2014-07-10 10:25:48.205167766 +0200
+@@ -119,7 +119,7 @@
+ , data-default
+ , email-validate
+ , filepath
+- , hamlet
++ , shakespeare >= 2.0
+ -- https://github.com/bos/aeson/issues/125 and https://github.com/tibbe/hashable/issues/66
+ , hashable <= 1.2.0.5 || > 1.2.0.7
+ , hjsmin
+@@ -167,7 +167,7 @@
+ , directory
+ , email-validate
+ , filepath
+- , hamlet
++ , shakespeare >= 2.0
+ -- https://github.com/bos/aeson/issues/125 and https://github.com/tibbe/hashable/issues/66
+ , hashable <= 1.2.0.5 || > 1.2.0.7
+ , hjsmin
diff --git a/patches/process-conduit/1.1.0.0/series b/patches/process-conduit/1.1.0.0/series
index cc66eba..a572b11 100644
--- a/patches/process-conduit/1.1.0.0/series
+++ b/patches/process-conduit/1.1.0.0/series
@@ -1 +1,2 @@
newer-conduit.diff
+shakespeare-2.0.patch
diff --git a/patches/process-conduit/1.1.0.0/shakespeare-2.0.patch b/patches/process-conduit/1.1.0.0/shakespeare-2.0.patch
new file mode 100644
index 0000000..8680c2a
--- /dev/null
+++ b/patches/process-conduit/1.1.0.0/shakespeare-2.0.patch
@@ -0,0 +1,14 @@
+Index: process-conduit-1.1.0.0/process-conduit.cabal
+===================================================================
+--- process-conduit-1.1.0.0.orig/process-conduit.cabal 2014-07-10 10:27:20.077164440 +0200
++++ process-conduit-1.1.0.0/process-conduit.cabal 2014-07-10 10:27:51.705163296 +0200
+@@ -35,8 +35,7 @@
+ , process >= 1.0
+ , conduit >= 1.1
+ , resourcet >= 1.1
+- , shakespeare-text >= 1.0
+- , shakespeare
++ , shakespeare >= 2.0
+
+ ghc-options: -Wall
+
diff --git a/patches/yesod-auth/1.3.1.1/no-attoparsec-conduit.diff b/patches/yesod-auth/1.3.1.1/no-attoparsec-conduit.diff
new file mode 100644
index 0000000..9729940
--- /dev/null
+++ b/patches/yesod-auth/1.3.1.1/no-attoparsec-conduit.diff
@@ -0,0 +1,12 @@
+Index: yesod-auth-1.3.1.1/yesod-auth.cabal
+===================================================================
+--- yesod-auth-1.3.1.1.orig/yesod-auth.cabal 2014-07-10 10:35:27.889146784 +0200
++++ yesod-auth-1.3.1.1/yesod-auth.cabal 2014-07-10 10:35:27.889146784 +0200
+@@ -60,7 +60,6 @@
+ , blaze-builder
+ , conduit
+ , conduit-extra
+- , attoparsec-conduit
+
+ exposed-modules: Yesod.Auth
+ Yesod.Auth.BrowserId
diff --git a/patches/yesod-auth/1.3.1/series b/patches/yesod-auth/1.3.1.1/series
similarity index 55%
rename from patches/yesod-auth/1.3.1/series
rename to patches/yesod-auth/1.3.1.1/series
index 89ad6b7..0377045 100644
--- a/patches/yesod-auth/1.3.1/series
+++ b/patches/yesod-auth/1.3.1.1/series
@@ -1 +1,2 @@
+shakespeare-2.0.patch
no-attoparsec-conduit.diff
diff --git a/patches/yesod-auth/1.3.1.1/shakespeare-2.0.patch b/patches/yesod-auth/1.3.1.1/shakespeare-2.0.patch
new file mode 100644
index 0000000..9bc9b6c
--- /dev/null
+++ b/patches/yesod-auth/1.3.1.1/shakespeare-2.0.patch
@@ -0,0 +1,16 @@
+Index: yesod-auth-1.3.1.1/yesod-auth.cabal
+===================================================================
+--- yesod-auth-1.3.1.1.orig/yesod-auth.cabal 2014-07-10 10:34:52.289148073 +0200
++++ yesod-auth-1.3.1.1/yesod-auth.cabal 2014-07-10 10:35:25.049146887 +0200
+@@ -33,10 +33,7 @@
+ , text >= 0.7
+ , mime-mail >= 0.3
+ , yesod-persistent >= 1.2
+- , hamlet >= 1.1
+- , shakespeare
+- , shakespeare-css >= 1.0
+- , shakespeare-js >= 1.0.2
++ , shakespeare >= 2.0
+ , containers
+ , unordered-containers
+ , yesod-form >= 1.3 && < 1.4
diff --git a/patches/yesod-auth/1.3.1/no-attoparsec-conduit.diff b/patches/yesod-auth/1.3.1/no-attoparsec-conduit.diff
deleted file mode 100644
index 06c278f..0000000
--- a/patches/yesod-auth/1.3.1/no-attoparsec-conduit.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/yesod-auth.cabal
-+++ b/yesod-auth.cabal
-@@ -63,7 +63,6 @@
- , blaze-builder
- , conduit
- , conduit-extra
-- , attoparsec-conduit
-
- exposed-modules: Yesod.Auth
- Yesod.Auth.BrowserId
diff --git a/patches/yesod-bin/1.2.10.2/no-network-conduit.diff b/patches/yesod-bin/1.2.11/no-network-conduit.diff
similarity index 100%
rename from patches/yesod-bin/1.2.10.2/no-network-conduit.diff
rename to patches/yesod-bin/1.2.11/no-network-conduit.diff
diff --git a/patches/yesod-bin/1.2.10.2/series b/patches/yesod-bin/1.2.11/series
similarity index 52%
rename from patches/yesod-bin/1.2.10.2/series
rename to patches/yesod-bin/1.2.11/series
index 9626b40..8f8c632 100644
--- a/patches/yesod-bin/1.2.10.2/series
+++ b/patches/yesod-bin/1.2.11/series
@@ -1 +1,2 @@
no-network-conduit.diff
+shakespeare-2.0.patch
diff --git a/patches/yesod-bin/1.2.11/shakespeare-2.0.patch b/patches/yesod-bin/1.2.11/shakespeare-2.0.patch
new file mode 100644
index 0000000..c808240
--- /dev/null
+++ b/patches/yesod-bin/1.2.11/shakespeare-2.0.patch
@@ -0,0 +1,17 @@
+Index: yesod-bin-1.2.11/yesod-bin.cabal
+===================================================================
+--- yesod-bin-1.2.11.orig/yesod-bin.cabal 2014-07-10 10:38:24.661140386 +0200
++++ yesod-bin-1.2.11/yesod-bin.cabal 2014-07-10 10:38:45.033139649 +0200
+@@ -51,11 +51,7 @@
+ , ghc-paths >= 0.1
+ , parsec >= 2.1 && < 4
+ , text >= 0.11
+- , shakespeare
+- , shakespeare-text >= 1.0
+- , shakespeare >= 1.0.2 && < 2.1
+- , shakespeare-js >= 1.0.2
+- , shakespeare-css >= 1.0.2
++ , shakespeare >= 2.0
+ , bytestring >= 0.9.1.4
+ , time >= 1.1.4
+ , template-haskell
diff --git a/patches/yesod-core/1.2.16.1/no-attoparsec-conduit-and-no-network-conduit.diff b/patches/yesod-core/1.2.16.1/no-attoparsec-conduit-and-no-network-conduit.diff
index 20b0790..846c6bc 100644
--- a/patches/yesod-core/1.2.16.1/no-attoparsec-conduit-and-no-network-conduit.diff
+++ b/patches/yesod-core/1.2.16.1/no-attoparsec-conduit-and-no-network-conduit.diff
@@ -1,6 +1,8 @@
---- a/yesod-core.cabal
-+++ b/yesod-core.cabal
-@@ -60,7 +60,6 @@
+Index: yesod-core-1.2.16.1/yesod-core.cabal
+===================================================================
+--- yesod-core-1.2.16.1.orig/yesod-core.cabal 2014-07-10 10:43:37.077129078 +0200
++++ yesod-core-1.2.16.1/yesod-core.cabal 2014-07-10 10:43:37.073129078 +0200
+@@ -56,7 +56,6 @@
, conduit >= 1.0.11
, resourcet >= 0.4.9 && < 1.2
, lifted-base >= 0.1.2
@@ -8,7 +10,7 @@
, blaze-html >= 0.5
, blaze-markup >= 0.5.1
, data-default
-@@ -125,7 +124,6 @@
+@@ -118,7 +117,6 @@
, containers
, lifted-base
, resourcet
diff --git a/patches/yesod-core/1.2.16.1/no-wai-test.diff b/patches/yesod-core/1.2.16.1/no-wai-test.diff
index d8bf1a4..48715c2 100644
--- a/patches/yesod-core/1.2.16.1/no-wai-test.diff
+++ b/patches/yesod-core/1.2.16.1/no-wai-test.diff
@@ -1,5 +1,7 @@
---- a/yesod-core.cabal
-+++ b/yesod-core.cabal
+Index: yesod-core-1.2.16.1/yesod-core.cabal
+===================================================================
+--- yesod-core-1.2.16.1.orig/yesod-core.cabal 2014-07-10 10:43:41.373128923 +0200
++++ yesod-core-1.2.16.1/yesod-core.cabal 2014-07-10 10:43:41.325128924 +0200
@@ -27,7 +27,7 @@
, time >= 1.1.4
, yesod-routes >= 1.2 && < 1.3
@@ -9,7 +11,7 @@
, bytestring >= 0.9.1.4
, text >= 0.7
, template-haskell
-@@ -106,7 +106,6 @@
+@@ -102,7 +102,6 @@
cpp-options: -DTEST
build-depends: base
,hspec >= 1.3
@@ -17,7 +19,7 @@
,wai
,yesod-core
,bytestring
-@@ -129,7 +128,7 @@
+@@ -122,7 +121,7 @@
, conduit-extra
, shakespeare
, streaming-commons
diff --git a/patches/yesod-core/1.2.16.1/series b/patches/yesod-core/1.2.16.1/series
index 79c7bfb..0219751 100644
--- a/patches/yesod-core/1.2.16.1/series
+++ b/patches/yesod-core/1.2.16.1/series
@@ -1,2 +1,3 @@
+shakespeare-2.0.patch
no-attoparsec-conduit-and-no-network-conduit.diff
no-wai-test.diff
diff --git a/patches/yesod-core/1.2.16.1/shakespeare-2.0.patch b/patches/yesod-core/1.2.16.1/shakespeare-2.0.patch
new file mode 100644
index 0000000..8481149
--- /dev/null
+++ b/patches/yesod-core/1.2.16.1/shakespeare-2.0.patch
@@ -0,0 +1,27 @@
+Index: yesod-core-1.2.16.1/yesod-core.cabal
+===================================================================
+--- yesod-core-1.2.16.1.orig/yesod-core.cabal 2014-07-10 10:39:28.705138068 +0200
++++ yesod-core-1.2.16.1/yesod-core.cabal 2014-07-10 10:39:58.473136991 +0200
+@@ -32,11 +32,7 @@
+ , text >= 0.7
+ , template-haskell
+ , path-pieces >= 0.1.2 && < 0.2
+- , hamlet >= 1.1
+- , shakespeare >= 1.0 && < 2.1
+- , shakespeare-js >= 1.0.2
+- , shakespeare-css >= 1.0
+- , shakespeare-i18n >= 1.0
++ , shakespeare >= 2.0 && < 2.1
+ , blaze-builder >= 0.2.1.4 && < 0.4
+ , transformers >= 0.2.2
+ , mtl
+@@ -111,9 +107,6 @@
+ ,wai
+ ,yesod-core
+ ,bytestring
+- ,hamlet
+- ,shakespeare-css
+- ,shakespeare-js
+ ,text
+ ,http-types
+ , random
diff --git a/patches/yesod-form/1.3.10/series b/patches/yesod-form/1.3.10/series
new file mode 100644
index 0000000..6fddf25
--- /dev/null
+++ b/patches/yesod-form/1.3.10/series
@@ -0,0 +1 @@
+shakespeare-2.0.patch
diff --git a/patches/yesod-form/1.3.10/shakespeare-2.0.patch b/patches/yesod-form/1.3.10/shakespeare-2.0.patch
new file mode 100644
index 0000000..faf6891
--- /dev/null
+++ b/patches/yesod-form/1.3.10/shakespeare-2.0.patch
@@ -0,0 +1,16 @@
+Index: yesod-form-1.3.10/yesod-form.cabal
+===================================================================
+--- yesod-form-1.3.10.orig/yesod-form.cabal 2014-07-10 10:40:41.985135416 +0200
++++ yesod-form-1.3.10/yesod-form.cabal 2014-07-10 10:42:35.673131301 +0200
+@@ -17,10 +17,7 @@
+ , yesod-core >= 1.2 && < 1.3
+ , yesod-persistent >= 1.2 && < 1.3
+ , time >= 1.1.4
+- , hamlet >= 1.1.8
+- , shakespeare
+- , shakespeare-css >= 1.0
+- , shakespeare-js >= 1.0.2
++ , shakespeare >= 2.0
+ , persistent >= 1.2 && < 1.4
+ , template-haskell
+ , transformers >= 0.2.2
diff --git a/patches/yesod-markdown/0.8.2/series b/patches/yesod-markdown/0.8.2/series
new file mode 100644
index 0000000..6fddf25
--- /dev/null
+++ b/patches/yesod-markdown/0.8.2/series
@@ -0,0 +1 @@
+shakespeare-2.0.patch
diff --git a/patches/yesod-markdown/0.8.2/shakespeare-2.0.patch b/patches/yesod-markdown/0.8.2/shakespeare-2.0.patch
new file mode 100644
index 0000000..0bb6c20
--- /dev/null
+++ b/patches/yesod-markdown/0.8.2/shakespeare-2.0.patch
@@ -0,0 +1,13 @@
+Index: yesod-markdown-0.8.2/yesod-markdown.cabal
+===================================================================
+--- yesod-markdown-0.8.2.orig/yesod-markdown.cabal 2014-07-10 10:42:48.621130832 +0200
++++ yesod-markdown-0.8.2/yesod-markdown.cabal 2014-07-10 10:43:26.497129461 +0200
+@@ -24,7 +24,7 @@
+ , directory
+ , yesod-core >= 1.2 && < 1.3
+ , yesod-form >= 1.3 && < 1.4
+- , hamlet >= 1.1 && < 1.2
++ , shakespeare >= 2.0
+ , persistent >= 0.9
+
+ ghc-options: -Wall
diff --git a/patches/yesod-newsfeed/1.2.0.2/series b/patches/yesod-newsfeed/1.2.0.2/series
new file mode 100644
index 0000000..6fddf25
--- /dev/null
+++ b/patches/yesod-newsfeed/1.2.0.2/series
@@ -0,0 +1 @@
+shakespeare-2.0.patch
diff --git a/patches/yesod-newsfeed/1.2.0.2/shakespeare-2.0.patch b/patches/yesod-newsfeed/1.2.0.2/shakespeare-2.0.patch
new file mode 100644
index 0000000..485429c
--- /dev/null
+++ b/patches/yesod-newsfeed/1.2.0.2/shakespeare-2.0.patch
@@ -0,0 +1,14 @@
+Index: yesod-newsfeed-1.2.0.2/yesod-newsfeed.cabal
+===================================================================
+--- yesod-newsfeed-1.2.0.2.orig/yesod-newsfeed.cabal 2014-07-10 10:44:03.817128110 +0200
++++ yesod-newsfeed-1.2.0.2/yesod-newsfeed.cabal 2014-07-10 10:44:35.565126961 +0200
+@@ -16,8 +16,7 @@
+ build-depends: base >= 4 && < 5
+ , yesod-core >= 1.2 && < 1.3
+ , time >= 1.1.4
+- , hamlet >= 1.1
+- , shakespeare
++ , shakespeare >= 2.0
+ , bytestring >= 0.9.1.4
+ , text >= 0.9
+ , xml-conduit >= 1.0
diff --git a/patches/yesod-static/1.2.4/series b/patches/yesod-static/1.2.4/series
index 191f029..2f623e3 100644
--- a/patches/yesod-static/1.2.4/series
+++ b/patches/yesod-static/1.2.4/series
@@ -1 +1,2 @@
no-wai-test.diff
+shakespeare-2.0.patch
diff --git a/patches/yesod-static/1.2.4/shakespeare-2.0.patch b/patches/yesod-static/1.2.4/shakespeare-2.0.patch
new file mode 100644
index 0000000..6216a5e
--- /dev/null
+++ b/patches/yesod-static/1.2.4/shakespeare-2.0.patch
@@ -0,0 +1,22 @@
+Index: yesod-static-1.2.4/yesod-static.cabal
+===================================================================
+--- yesod-static-1.2.4.orig/yesod-static.cabal 2014-07-10 10:46:15.705123337 +0200
++++ yesod-static-1.2.4/yesod-static.cabal 2014-07-10 10:46:33.233122702 +0200
+@@ -47,7 +47,7 @@
+ , system-filepath >= 0.4.6 && < 0.5
+ , system-fileio >= 0.3
+ , data-default
+- , shakespeare-css >= 1.0.3
++ , shakespeare >= 2.0
+ , mime-types >= 0.1
+ , hjsmin
+ , filepath >= 1.3
+@@ -106,7 +106,7 @@
+ , system-filepath
+ , system-fileio
+ , data-default
+- , shakespeare-css
++ , shakespeare
+ , mime-types
+ , hjsmin
+ , filepath
diff --git a/patches/yesod/1.2.6/no-network-conduit.diff b/patches/yesod/1.2.6/no-network-conduit.diff
index 41d79e5..9f764b0 100644
--- a/patches/yesod/1.2.6/no-network-conduit.diff
+++ b/patches/yesod/1.2.6/no-network-conduit.diff
@@ -1,6 +1,8 @@
---- a/yesod.cabal
-+++ b/yesod.cabal
-@@ -39,7 +39,6 @@
+Index: yesod-1.2.6/yesod.cabal
+===================================================================
+--- yesod-1.2.6.orig/yesod.cabal 2014-07-10 10:31:51.325154623 +0200
++++ yesod-1.2.6/yesod.cabal 2014-07-10 10:31:51.321154623 +0200
+@@ -37,7 +37,6 @@
, aeson
, safe
, data-default
diff --git a/patches/yesod/1.2.6/series b/patches/yesod/1.2.6/series
index 9626b40..74ade25 100644
--- a/patches/yesod/1.2.6/series
+++ b/patches/yesod/1.2.6/series
@@ -1 +1,2 @@
+shakespeare-2.0.patch
no-network-conduit.diff
diff --git a/patches/yesod/1.2.6/shakespeare-2.0.patch b/patches/yesod/1.2.6/shakespeare-2.0.patch
new file mode 100644
index 0000000..8f5bcf3
--- /dev/null
+++ b/patches/yesod/1.2.6/shakespeare-2.0.patch
@@ -0,0 +1,15 @@
+Index: yesod-1.2.6/yesod.cabal
+===================================================================
+--- yesod-1.2.6.orig/yesod.cabal 2014-07-10 10:28:50.701161160 +0200
++++ yesod-1.2.6/yesod.cabal 2014-07-10 10:30:10.669158266 +0200
+@@ -30,9 +30,7 @@
+ , transformers >= 0.2.2
+ , wai >= 1.3
+ , wai-extra >= 1.3
+- , hamlet >= 1.1
+- , shakespeare-js >= 1.0.2
+- , shakespeare-css >= 1.0
++ , shakespeare >= 2.0
+ , warp >= 1.3
+ , blaze-html >= 0.5
+ , blaze-markup >= 0.5.1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list