diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2014-08-13 19:59:38 +0400 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2014-08-13 19:59:38 +0400 |
| commit | fdcd2ee4b6b56e41ce9523cea292af7296a5b513 (patch) | |
| tree | e2222bfc3167edd0eb6944ee478034d2d5ff5d4f | |
| parent | 17d3ffedbdc0dca01478ebc22dd4261ed035e6f7 (diff) | |
| download | DHG_packages-fdcd2ee4b6b56e41ce9523cea292af7296a5b513.tar.gz | |
haskell-notmuch-web: Use package imports to avoid FTBFS with conduit-extra and process-conduit. Hence urgency high.
| -rw-r--r-- | p/haskell-notmuch-web/debian/changelog | 7 | ||||
| -rw-r--r-- | p/haskell-notmuch-web/debian/patches/process-conduit-package-import | 36 | ||||
| -rw-r--r-- | p/haskell-notmuch-web/debian/patches/series | 1 |
3 files changed, 44 insertions, 0 deletions
diff --git a/p/haskell-notmuch-web/debian/changelog b/p/haskell-notmuch-web/debian/changelog index a428d655f..eff6972f9 100644 --- a/p/haskell-notmuch-web/debian/changelog +++ b/p/haskell-notmuch-web/debian/changelog @@ -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@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 --git a/p/haskell-notmuch-web/debian/patches/process-conduit-package-import b/p/haskell-notmuch-web/debian/patches/process-conduit-package-import new file mode 100644 index 000000000..4b815996f --- /dev/null +++ b/p/haskell-notmuch-web/debian/patches/process-conduit-package-import @@ -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@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@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 --git a/p/haskell-notmuch-web/debian/patches/series b/p/haskell-notmuch-web/debian/patches/series index 6c6a6ca80..5cf474499 100644 --- a/p/haskell-notmuch-web/debian/patches/series +++ b/p/haskell-notmuch-web/debian/patches/series @@ -1,3 +1,4 @@ testsuite-http-code no-attoparsec-conduit.diff newer-resourcet.diff +process-conduit-package-import |