[Pkg-haskell-commits] darcs: haskell-yesod-core: staging conduit 1.1 transition
Clint Adams
clint at debian.org
Tue Jun 10 13:58:55 UTC 2014
Tue Jun 10 13:54:39 UTC 2014 Clint Adams <clint at debian.org>
* staging conduit 1.1 transition
M ./changelog +6
M ./control -20 +18
A ./patches/
A ./patches/no-attoparsec-conduit-and-no-network-conduit.diff
A ./patches/no-wai-test.diff
A ./patches/series
Tue Jun 10 13:54:39 UTC 2014 Clint Adams <clint at debian.org>
* staging conduit 1.1 transition
diff -rN -u old-haskell-yesod-core/changelog new-haskell-yesod-core/changelog
--- old-haskell-yesod-core/changelog 2014-06-10 13:58:55.605786365 +0000
+++ new-haskell-yesod-core/changelog 2014-06-10 13:58:55.605786365 +0000
@@ -1,3 +1,9 @@
+haskell-yesod-core (1.2.16.1-1) unstable; urgency=medium
+
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Fri, 06 Jun 2014 15:12:53 -0400
+
haskell-yesod-core (1.2.6.7-3) unstable; urgency=medium
* Fix upper bound on shakespeare-js
diff -rN -u old-haskell-yesod-core/control new-haskell-yesod-core/control
--- old-haskell-yesod-core/control 2014-06-10 13:58:55.605786365 +0000
+++ new-haskell-yesod-core/control 2014-06-10 13:58:55.605786365 +0000
@@ -10,8 +10,6 @@
, ghc-prof
, libghc-aeson-dev (>= 0.5)
, libghc-aeson-prof
- , libghc-attoparsec-conduit-dev
- , libghc-attoparsec-conduit-prof
, libghc-blaze-builder-dev (>= 0.2.1.4)
, libghc-blaze-builder-dev (<< 0.4)
, libghc-blaze-builder-prof
@@ -26,20 +24,20 @@
, libghc-clientsession-dev (>= 0.9)
, libghc-clientsession-dev (<< 0.10)
, libghc-clientsession-prof
- , libghc-conduit-dev (>= 0.5)
+ , libghc-conduit-dev (>= 1.0.11)
, libghc-conduit-prof
- , libghc-cookie-dev (>= 0.4)
+ , libghc-conduit-extra-dev
+ , libghc-conduit-extra-prof
+ , libghc-cookie-dev (>= 0.4.1)
, libghc-cookie-dev (<< 0.5)
, libghc-cookie-prof
, libghc-data-default-dev
, libghc-data-default-prof
- , libghc-failure-dev (>= 0.2)
- , libghc-failure-dev (<< 0.3)
- , libghc-failure-prof
+ , libghc-exceptions-dev
+ , libghc-exceptions-prof
, libghc-fast-logger-dev (>= 0.2)
, libghc-fast-logger-prof
, libghc-hamlet-dev (>= 1.1)
- , libghc-hamlet-dev (<< 1.2)
, libghc-hamlet-prof
, libghc-http-types-dev (>= 0.7)
, libghc-http-types-prof
@@ -60,30 +58,28 @@
, libghc-random-dev (<< 1.1)
, libghc-random-prof
, libghc-resourcet-dev (>= 0.4.9)
- , libghc-resourcet-dev (<< 0.5)
+ , libghc-resourcet-dev (<< 1.2)
, libghc-resourcet-prof
, libghc-safe-dev
, libghc-safe-prof
, libghc-shakespeare-dev (>= 1.0)
- , libghc-shakespeare-dev (<< 1.3)
+ , libghc-shakespeare-dev (<< 2.1)
, libghc-shakespeare-prof
- , libghc-shakespeare-js-dev (>= 1.0.2)
- , libghc-shakespeare-js-dev (<< 1.3)
- , libghc-shakespeare-js-prof
, libghc-shakespeare-css-dev (>= 1.0)
- , libghc-shakespeare-css-dev (<< 1.1)
, libghc-shakespeare-css-prof
, libghc-shakespeare-i18n-dev (>= 1.0)
- , libghc-shakespeare-i18n-dev (<< 1.1)
, libghc-shakespeare-i18n-prof
+ , libghc-shakespeare-js-dev (>= 1.0.2)
+ , libghc-shakespeare-js-prof
, ghc-ghci
, libghc-text-dev (>= 0.7)
, libghc-text-prof
, libghc-transformers-dev (>= 0.2.2)
- , libghc-transformers-dev (<< 0.4)
, libghc-transformers-prof
, libghc-transformers-base-dev (>= 0.4)
, libghc-transformers-base-prof
+ , libghc-unix-compat-dev
+ , libghc-unix-compat-prof
, libghc-vector-dev (>= 0.9)
, libghc-vector-dev (<< 0.11)
, libghc-vector-prof
@@ -99,22 +95,23 @@
, libghc-yesod-routes-dev (<< 1.3)
, libghc-yesod-routes-prof
, libghc-hspec-dev (>= 1.3)
- , libghc-wai-test-dev (>= 1.3.0.5)
, libghc-hunit-dev
, libghc-quickcheck2-dev
- , libghc-conduit-dev
+ , libghc-async-dev
+ , libghc-streaming-commons-dev
Build-Depends-Indep: ghc-doc
, libghc-aeson-doc
- , libghc-attoparsec-conduit-doc
, libghc-blaze-builder-doc
, libghc-blaze-html-doc
, libghc-blaze-markup-doc
, libghc-case-insensitive-doc
, libghc-cereal-doc
, libghc-clientsession-doc
+ , libghc-conduit-doc
+ , libghc-conduit-extra-doc
, libghc-cookie-doc
, libghc-data-default-doc
- , libghc-failure-doc
+ , libghc-exceptions-doc
, libghc-fast-logger-doc
, libghc-hamlet-doc
, libghc-http-types-doc
@@ -133,6 +130,7 @@
, libghc-text-doc
, libghc-transformers-doc
, libghc-transformers-base-doc
+ , libghc-unix-compat-doc
, libghc-vector-doc
, libghc-wai-doc
, libghc-wai-extra-doc
diff -rN -u old-haskell-yesod-core/patches/no-attoparsec-conduit-and-no-network-conduit.diff new-haskell-yesod-core/patches/no-attoparsec-conduit-and-no-network-conduit.diff
--- old-haskell-yesod-core/patches/no-attoparsec-conduit-and-no-network-conduit.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-yesod-core/patches/no-attoparsec-conduit-and-no-network-conduit.diff 2014-06-10 13:58:55.609786363 +0000
@@ -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 -rN -u old-haskell-yesod-core/patches/no-wai-test.diff new-haskell-yesod-core/patches/no-wai-test.diff
--- old-haskell-yesod-core/patches/no-wai-test.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-yesod-core/patches/no-wai-test.diff 2014-06-10 13:58:55.609786363 +0000
@@ -0,0 +1,28 @@
+--- a/yesod-core.cabal
++++ b/yesod-core.cabal
+@@ -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
+ ,yesod-core
+ ,bytestring
+@@ -129,7 +128,7 @@
+ , conduit-extra
+ , shakespeare
+ , streaming-commons
+- , wai-extra
++ , wai-extra >= 3.0
+ ghc-options: -Wall
+ extensions: TemplateHaskell
+
diff -rN -u old-haskell-yesod-core/patches/series new-haskell-yesod-core/patches/series
--- old-haskell-yesod-core/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-yesod-core/patches/series 2014-06-10 13:58:55.609786363 +0000
@@ -0,0 +1,2 @@
+no-attoparsec-conduit-and-no-network-conduit.diff
+no-wai-test.diff
More information about the Pkg-haskell-commits
mailing list