[Pkg-haskell-commits] darcs: haskell-notmuch-web: Use package imports to avoid FTBFS with conduit-extra and process-conduit. Hence urgency high.

[Joachim Breitner]

Wed Aug 13 15:59:38 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Use package imports to avoid FTBFS with conduit-extra and process-conduit. Hence urgency high.

    M ./changelog +7
    A ./patches/process-conduit-package-import
    M ./patches/series +1

Wed Aug 13 15:59:38 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Use package imports to avoid FTBFS with conduit-extra and process-conduit. Hence urgency high.
diff -rN -u old-haskell-notmuch-web/changelog new-haskell-notmuch-web/changelog
--- old-haskell-notmuch-web/changelog	2014-08-13 16:10:29.827442553 +0000
+++ new-haskell-notmuch-web/changelog	2014-08-13 16:10:29.839442549 +0000
@@ -1,3 +1,10 @@
+haskell-notmuch-web (0.2.0-7) UNRELEASED; urgency=high
+
+  * Use package imports to avoid FTBFS with conduit-extra and process-conduit.
+    Hence urgency high.
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 13 Aug 2014 17:59:20 +0200
+
 haskell-notmuch-web (0.2.0-6) unstable; urgency=medium
 
   * Drop patch config-in-etc, thanks to Rob Browning for reporting the
diff -rN -u old-haskell-notmuch-web/patches/process-conduit-package-import new-haskell-notmuch-web/patches/process-conduit-package-import
--- old-haskell-notmuch-web/patches/process-conduit-package-import	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-notmuch-web/patches/process-conduit-package-import	2014-08-13 16:10:29.839442549 +0000
@@ -0,0 +1,36 @@
+Index: haskell-notmuch-web-0.2.0/src/Handler/Abook.hs
+===================================================================
+--- haskell-notmuch-web-0.2.0.orig/src/Handler/Abook.hs	2014-08-13 17:59:00.461227724 +0200
++++ haskell-notmuch-web-0.2.0/src/Handler/Abook.hs	2014-08-13 17:59:09.321227397 +0200
+@@ -1,3 +1,4 @@
++{-# LANGUAGE PackageImports #-}
+ {-
+ Copyright (C) 2013 John Lenz <lenz at math.uic.edu>
+ 
+@@ -19,7 +20,7 @@
+ import Import
+ import Control.Exception.Lifted (try)
+ import Control.Monad.Trans.Resource (runResourceT)
+-import Data.Conduit.Process
++import "process-conduit" Data.Conduit.Process
+ import System.Exit (ExitCode(..))
+ import qualified Data.Text as T
+ import qualified Data.Vector as V
+Index: haskell-notmuch-web-0.2.0/src/NotmuchCmd.hs
+===================================================================
+--- haskell-notmuch-web-0.2.0.orig/src/NotmuchCmd.hs	2014-08-13 17:59:00.461227724 +0200
++++ haskell-notmuch-web-0.2.0/src/NotmuchCmd.hs	2014-08-13 17:59:00.461227724 +0200
+@@ -1,3 +1,4 @@
++{-# LANGUAGE PackageImports #-}
+ {-
+ Copyright (C) 2013 John Lenz <lenz at math.uic.edu>
+ 
+@@ -60,7 +61,7 @@
+ import Data.ByteString (ByteString)
+ import Data.Conduit
+ import Data.Conduit.Attoparsec (sinkParser)
+-import Data.Conduit.Process
++import "process-conduit" Data.Conduit.Process
+ import Data.Monoid ((<>))
+ import Data.Time.Calendar (Day(..))
+ import Data.Time.Clock
diff -rN -u old-haskell-notmuch-web/patches/series new-haskell-notmuch-web/patches/series
--- old-haskell-notmuch-web/patches/series	2014-08-13 16:10:29.827442553 +0000
+++ new-haskell-notmuch-web/patches/series	2014-08-13 16:10:29.839442549 +0000
@@ -1,3 +1,4 @@
 testsuite-http-code
 no-attoparsec-conduit.diff
 newer-resourcet.diff
+process-conduit-package-import