[Pkg-haskell-commits] darcs: haskell-notmuch-web: staging conduit 1.1 transition
Clint Adams
clint at debian.org
Tue Jun 10 13:59:32 UTC 2014
Tue Jun 10 13:54:40 UTC 2014 Clint Adams <clint at debian.org>
* staging conduit 1.1 transition
M ./changelog +6
M ./control -3 +6
A ./patches/newer-resourcet.diff
A ./patches/no-attoparsec-conduit.diff
M ./patches/series +2
Tue Jun 10 13:54:40 UTC 2014 Clint Adams <clint at debian.org>
* staging conduit 1.1 transition
diff -rN -u old-haskell-notmuch-web/changelog new-haskell-notmuch-web/changelog
--- old-haskell-notmuch-web/changelog 2014-06-10 13:59:32.281761664 +0000
+++ new-haskell-notmuch-web/changelog 2014-06-10 13:59:32.285761661 +0000
@@ -1,3 +1,9 @@
+haskell-notmuch-web (0.2.0-5) unstable; urgency=medium
+
+ * Patch for newer conduit.
+
+ -- Clint Adams <clint at debian.org> Mon, 09 Jun 2014 15:49:33 -0400
+
haskell-notmuch-web (0.2.0-4) unstable; urgency=medium
* Pass correct parameters to install, thanks Colin for noticing me not
diff -rN -u old-haskell-notmuch-web/control new-haskell-notmuch-web/control
--- old-haskell-notmuch-web/control 2014-06-10 13:59:32.281761664 +0000
+++ new-haskell-notmuch-web/control 2014-06-10 13:59:32.289761658 +0000
@@ -12,8 +12,6 @@
, libghc-aeson-prof
, libghc-attoparsec-dev
, libghc-attoparsec-prof
- , libghc-attoparsec-conduit-dev
- , libghc-attoparsec-conduit-prof
, libghc-blaze-builder-dev
, libghc-blaze-builder-prof
, libghc-blaze-html-dev
@@ -24,6 +22,8 @@
, libghc-case-insensitive-prof
, libghc-conduit-dev
, libghc-conduit-prof
+ , libghc-conduit-extra-dev
+ , libghc-conduit-extra-prof
, libghc-data-default-dev
, libghc-data-default-prof
, libghc-email-validate-dev
@@ -52,6 +52,8 @@
, libghc-pwstore-fast-prof
, libghc-random-dev
, libghc-random-prof
+ , libghc-resourcet-dev
+ , libghc-resourcet-prof
, libghc-tagsoup-dev
, libghc-tagsoup-prof
, ghc-ghci
@@ -91,12 +93,12 @@
Build-Depends-Indep: ghc-doc
, libghc-aeson-doc
, libghc-attoparsec-doc
- , libghc-attoparsec-conduit-doc
, libghc-blaze-builder-doc
, libghc-blaze-html-doc
, libghc-blaze-markup-doc
, libghc-case-insensitive-doc
, libghc-conduit-doc
+ , libghc-conduit-extra-doc
, libghc-data-default-doc
, libghc-email-validate-doc
, libghc-hamlet-doc
@@ -111,6 +113,7 @@
, libghc-process-conduit-doc
, libghc-pwstore-fast-doc
, libghc-random-doc
+ , libghc-resourcet-doc
, libghc-tagsoup-doc
, libghc-text-doc
, libghc-text-icu-doc
diff -rN -u old-haskell-notmuch-web/patches/newer-resourcet.diff new-haskell-notmuch-web/patches/newer-resourcet.diff
--- old-haskell-notmuch-web/patches/newer-resourcet.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-notmuch-web/patches/newer-resourcet.diff 2014-06-10 13:59:32.293761656 +0000
@@ -0,0 +1,48 @@
+--- a/src/NotmuchCmd.hs
++++ b/src/NotmuchCmd.hs
+@@ -54,6 +54,7 @@
+ import Control.Exception (Exception, throw)
+ import Control.Applicative
+ import Control.Monad.IO.Class (MonadIO(..))
++import Control.Monad.Trans.Resource (MonadResource, runResourceT)
+ import Data.Aeson
+ import Data.Aeson.Types (Parser)
+ import Data.ByteString (ByteString)
+--- a/notmuch-web.cabal
++++ b/notmuch-web.cabal
+@@ -134,6 +134,7 @@
+ , process-conduit >= 0.5
+ , pwstore-fast
+ , random
++ , resourcet
+ , tagsoup
+ , template-haskell
+ , text
+@@ -181,6 +182,7 @@
+ , process-conduit >= 0.5
+ , pwstore-fast
+ , random
++ , resourcet
+ , tagsoup
+ , template-haskell
+ , text
+--- a/src/Handler/Abook.hs
++++ b/src/Handler/Abook.hs
+@@ -18,6 +18,7 @@
+
+ import Import
+ import Control.Exception.Lifted (try)
++import Control.Monad.Trans.Resource (runResourceT)
+ import Data.Conduit.Process
+ import System.Exit (ExitCode(..))
+ import qualified Data.Text as T
+--- a/src/Handler/View.hs
++++ b/src/Handler/View.hs
+@@ -28,6 +28,7 @@
+ import Handler.Tags
+
+ import Blaze.ByteString.Builder (fromByteString)
++import Control.Monad.Trans.Resource (ResourceT)
+ import Text.Blaze.Html.Renderer.Text (renderHtml)
+ import Text.Markdown
+ import qualified Data.ByteString as B
diff -rN -u old-haskell-notmuch-web/patches/no-attoparsec-conduit.diff new-haskell-notmuch-web/patches/no-attoparsec-conduit.diff
--- old-haskell-notmuch-web/patches/no-attoparsec-conduit.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-notmuch-web/patches/no-attoparsec-conduit.diff 2014-06-10 13:59:32.293761656 +0000
@@ -0,0 +1,32 @@
+--- a/notmuch-web.cabal
++++ b/notmuch-web.cabal
+@@ -107,13 +107,13 @@
+
+ , aeson
+ , attoparsec
+- , attoparsec-conduit
+ , blaze-builder
+ , blaze-html
+ , blaze-markup
+ , bytestring
+ , case-insensitive
+ , conduit
++ , conduit-extra
+ , containers
+ , directory
+ , data-default
+@@ -154,13 +154,13 @@
+
+ , aeson
+ , attoparsec
+- , attoparsec-conduit
+ , blaze-builder
+ , blaze-html
+ , blaze-markup
+ , bytestring
+ , case-insensitive
+ , conduit
++ , conduit-extra
+ , containers
+ , data-default
+ , directory
diff -rN -u old-haskell-notmuch-web/patches/series new-haskell-notmuch-web/patches/series
--- old-haskell-notmuch-web/patches/series 2014-06-10 13:59:32.277761666 +0000
+++ new-haskell-notmuch-web/patches/series 2014-06-10 13:59:32.293761656 +0000
@@ -1,2 +1,4 @@
testsuite-http-code
config-in-etc
+no-attoparsec-conduit.diff
+newer-resourcet.diff
More information about the Pkg-haskell-commits
mailing list