[Pkg-haskell-commits] [package-plan] 01/02: Minor yesod upgrades
Joachim Breitner
nomeata at moszumanska.debian.org
Wed Aug 6 21:28:16 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch master
in repository package-plan.
commit 0335e03d2d172eade8de4521112fc2131bac34f4
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Wed Aug 6 23:04:01 2014 +0200
Minor yesod upgrades
---
packages.txt | 12 ++++-----
.../{1.3.1 => 1.3.4}/no-attoparsec-conduit.diff | 0
patches/yesod-auth/{1.3.1 => 1.3.4}/series | 0
.../{1.2.10.2 => 1.2.12.2}/no-network-conduit.diff | 0
patches/yesod-bin/{1.2.10.2 => 1.2.12.2}/series | 0
...-attoparsec-conduit-and-no-network-conduit.diff | 18 +++++++++++++
patches/yesod-core/1.2.19/no-wai-test.diff | 30 ++++++++++++++++++++++
patches/yesod-core/1.2.19/series | 2 ++
patches/yesod-test/1.2.3.2/no-wai-test.diff | 14 ++++++++++
patches/yesod-test/1.2.3.2/series | 1 +
10 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/packages.txt b/packages.txt
index 8bc027a..a151ab6 100644
--- a/packages.txt
+++ b/packages.txt
@@ -711,7 +711,7 @@ x509-util 1.5.0 binary
x509-validation 1.5.0
xdg-basedir 0.2.2
xhtml 3000.2.1
-xml 1.3.12
+xml 1.3.13
xml2html 0.2.0
xml-conduit 1.2.0.2
xml-hamlet 0.4.0.9
@@ -723,19 +723,19 @@ xss-sanitize 0.3.4
yaml 0.8.8.4
yaml-light 0.1.4
yesod 1.2.6.1
-yesod-auth 1.3.1
+yesod-auth 1.3.4
yesod-auth-account 1.2.6
yesod-auth-oauth 1.2.0
-yesod-bin 1.2.10.2 binary=yesod
-yesod-core 1.2.16.1
+yesod-bin 1.2.12.2 binary=yesod
+yesod-core 1.2.19
yesod-default 1.2.0
-yesod-form 1.3.10
+yesod-form 1.3.15
yesod-markdown 0.8.5
yesod-newsfeed 1.2.1
yesod-persistent 1.2.3 notest
yesod-routes 1.2.0.7
yesod-static 1.2.4
-yesod-test 1.2.2
+yesod-test 1.2.3.2
yi 0.7.1
zeromq4-haskell 0.6 notest
zip-archive 0.1.3.4
diff --git a/patches/yesod-auth/1.3.1/no-attoparsec-conduit.diff b/patches/yesod-auth/1.3.4/no-attoparsec-conduit.diff
similarity index 100%
rename from patches/yesod-auth/1.3.1/no-attoparsec-conduit.diff
rename to patches/yesod-auth/1.3.4/no-attoparsec-conduit.diff
diff --git a/patches/yesod-auth/1.3.1/series b/patches/yesod-auth/1.3.4/series
similarity index 100%
rename from patches/yesod-auth/1.3.1/series
rename to patches/yesod-auth/1.3.4/series
diff --git a/patches/yesod-bin/1.2.10.2/no-network-conduit.diff b/patches/yesod-bin/1.2.12.2/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.12.2/no-network-conduit.diff
diff --git a/patches/yesod-bin/1.2.10.2/series b/patches/yesod-bin/1.2.12.2/series
similarity index 100%
rename from patches/yesod-bin/1.2.10.2/series
rename to patches/yesod-bin/1.2.12.2/series
diff --git a/patches/yesod-core/1.2.19/no-attoparsec-conduit-and-no-network-conduit.diff b/patches/yesod-core/1.2.19/no-attoparsec-conduit-and-no-network-conduit.diff
new file mode 100644
index 0000000..20b0790
--- /dev/null
+++ b/patches/yesod-core/1.2.19/no-attoparsec-conduit-and-no-network-conduit.diff
@@ -0,0 +1,18 @@
+--- a/yesod-core.cabal
++++ b/yesod-core.cabal
+@@ -60,7 +60,6 @@
+ , conduit >= 1.0.11
+ , resourcet >= 0.4.9 && < 1.2
+ , lifted-base >= 0.1.2
+- , attoparsec-conduit
+ , blaze-html >= 0.5
+ , blaze-markup >= 0.5.1
+ , data-default
+@@ -125,7 +124,6 @@
+ , containers
+ , lifted-base
+ , resourcet
+- , network-conduit
+ , network
+ , async
+ , conduit-extra
diff --git a/patches/yesod-core/1.2.19/no-wai-test.diff b/patches/yesod-core/1.2.19/no-wai-test.diff
new file mode 100644
index 0000000..1db4eb5
--- /dev/null
+++ b/patches/yesod-core/1.2.19/no-wai-test.diff
@@ -0,0 +1,30 @@
+Index: yesod-core-1.2.19/yesod-core.cabal
+===================================================================
+--- yesod-core-1.2.19.orig/yesod-core.cabal 2014-08-06 22:57:35.698862404 +0200
++++ yesod-core-1.2.19/yesod-core.cabal 2014-08-06 22:58:01.134861448 +0200
+@@ -27,7 +27,7 @@
+ , time >= 1.1.4
+ , yesod-routes >= 1.2 && < 1.3
+ , wai >= 1.4
+- , wai-extra >= 1.3
++ , wai-extra >= 3.0
+ , bytestring >= 0.9.1.4
+ , text >= 0.7
+ , template-haskell
+@@ -106,7 +106,6 @@
+ cpp-options: -DTEST
+ build-depends: base
+ ,hspec >= 1.3
+- ,wai-test >= 1.3.0.5
+ ,wai >= 3.0
+ ,yesod-core
+ ,bytestring
+@@ -129,7 +128,7 @@
+ , conduit-extra
+ , shakespeare
+ , streaming-commons
+- , wai-extra
++ , wai-extra >= 3.0
+ ghc-options: -Wall
+ extensions: TemplateHaskell
+
diff --git a/patches/yesod-core/1.2.19/series b/patches/yesod-core/1.2.19/series
new file mode 100644
index 0000000..79c7bfb
--- /dev/null
+++ b/patches/yesod-core/1.2.19/series
@@ -0,0 +1,2 @@
+no-attoparsec-conduit-and-no-network-conduit.diff
+no-wai-test.diff
diff --git a/patches/yesod-test/1.2.3.2/no-wai-test.diff b/patches/yesod-test/1.2.3.2/no-wai-test.diff
new file mode 100644
index 0000000..5ff3497
--- /dev/null
+++ b/patches/yesod-test/1.2.3.2/no-wai-test.diff
@@ -0,0 +1,14 @@
+Index: yesod-test-1.2.3.2/yesod-test.cabal
+===================================================================
+--- yesod-test-1.2.3.2.orig/yesod-test.cabal 2014-08-06 22:54:39.894869008 +0200
++++ yesod-test-1.2.3.2/yesod-test.cabal 2014-08-06 22:54:51.706868564 +0200
+@@ -19,8 +19,7 @@
+ , persistent >= 1.0
+ , transformers >= 0.2.2
+ , wai >= 1.3
+- , wai-test >= 1.3
+- , wai-extra
++ , wai-extra >= 3.0
+ , network >= 2.2
+ , http-types >= 0.7
+ , HUnit >= 1.2
diff --git a/patches/yesod-test/1.2.3.2/series b/patches/yesod-test/1.2.3.2/series
new file mode 100644
index 0000000..191f029
--- /dev/null
+++ b/patches/yesod-test/1.2.3.2/series
@@ -0,0 +1 @@
+no-wai-test.diff
--
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