[Pkg-haskell-commits] darcs: haskell-yesod: staging conduit 1.1 transition

[Clint Adams]

Tue Jun 10 13:54:40 UTC 2014  Clint Adams <clint at debian.org>
  * staging conduit 1.1 transition

    M ./changelog +6
    M ./control -4 +3
    R ./patches/no-conduit-extra.diff
    A ./patches/no-network-conduit.diff
    M ./patches/series -1 +1

Tue Jun 10 13:54:40 UTC 2014  Clint Adams <clint at debian.org>
  * staging conduit 1.1 transition
diff -rN -u old-haskell-yesod/changelog new-haskell-yesod/changelog
--- old-haskell-yesod/changelog	2014-06-10 13:59:16.661772175 +0000
+++ new-haskell-yesod/changelog	2014-06-10 13:59:16.665772172 +0000
@@ -1,3 +1,9 @@
+haskell-yesod (1.2.6-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Mon, 09 Jun 2014 15:41:12 -0400
+
 haskell-yesod (1.2.5.2-1) unstable; urgency=medium
 
   * New upstream version to reduce skew with yesod-bin.
diff -rN -u old-haskell-yesod/control new-haskell-yesod/control
--- old-haskell-yesod/control	2014-06-10 13:59:16.661772175 +0000
+++ new-haskell-yesod/control	2014-06-10 13:59:16.665772172 +0000
@@ -14,6 +14,8 @@
   , libghc-blaze-html-prof
   , libghc-blaze-markup-dev (>= 0.5.1)
   , libghc-blaze-markup-prof
+  , libghc-conduit-extra-dev
+  , libghc-conduit-extra-prof
   , libghc-data-default-dev
   , libghc-data-default-prof
   , libghc-fast-logger-dev
@@ -25,8 +27,6 @@
   , libghc-monad-control-prof
   , libghc-monad-logger-dev
   , libghc-monad-logger-prof
-  , libghc-network-conduit-dev
-  , libghc-network-conduit-prof
   , libghc-safe-dev
   , libghc-safe-prof
   , libghc-shakespeare-dev
@@ -39,7 +39,6 @@
   , libghc-text-dev
   , libghc-text-prof
   , libghc-transformers-dev (>= 0.2.2)
-  , libghc-transformers-dev (<< 0.4)
   , libghc-transformers-prof
   , libghc-unordered-containers-dev
   , libghc-unordered-containers-prof
@@ -67,12 +66,12 @@
   , libghc-aeson-doc
   , libghc-blaze-html-doc
   , libghc-blaze-markup-doc
+  , libghc-conduit-extra-doc
   , libghc-data-default-doc
   , libghc-fast-logger-doc
   , libghc-hamlet-doc
   , libghc-monad-control-doc
   , libghc-monad-logger-doc
-  , libghc-network-conduit-doc
   , libghc-safe-doc
   , libghc-shakespeare-doc
   , libghc-shakespeare-css-doc
diff -rN -u old-haskell-yesod/patches/no-conduit-extra.diff new-haskell-yesod/patches/no-conduit-extra.diff
--- old-haskell-yesod/patches/no-conduit-extra.diff	2014-06-10 13:59:16.657772178 +0000
+++ new-haskell-yesod/patches/no-conduit-extra.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
---- a/yesod.cabal
-+++ b/yesod.cabal
-@@ -48,7 +48,6 @@
-                    , bytestring
-                    , monad-logger
-                    , fast-logger
--                   , conduit-extra
-                    , shakespeare
- 
-     exposed-modules: Yesod
diff -rN -u old-haskell-yesod/patches/no-network-conduit.diff new-haskell-yesod/patches/no-network-conduit.diff
--- old-haskell-yesod/patches/no-network-conduit.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-yesod/patches/no-network-conduit.diff	2014-06-10 13:59:16.665772172 +0000
@@ -0,0 +1,10 @@
+--- a/yesod.cabal
++++ b/yesod.cabal
+@@ -39,7 +39,6 @@
+                    , aeson
+                    , safe
+                    , data-default
+-                   , network-conduit
+                    , unordered-containers
+                    , yaml
+                    , text
diff -rN -u old-haskell-yesod/patches/series new-haskell-yesod/patches/series
--- old-haskell-yesod/patches/series	2014-06-10 13:59:16.657772178 +0000
+++ new-haskell-yesod/patches/series	2014-06-10 13:59:16.665772172 +0000
@@ -1 +1 @@
-no-conduit-extra.diff
+no-network-conduit.diff