[Pkg-haskell-commits] [package-plan] 416/457: Actually add rss2irc patches

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository package-plan.

commit 54b6ea7fab5edc8bdae5d5feddd39160f1d5d96e
Author: Clint Adams <clint at debian.org>
Date:   Tue Mar 4 18:41:55 2014 +0000

    Actually add rss2irc patches
---
 patches/rss2irc/1.0.5/newer-http-conduit.diff | 31 +++++++++++++++++++++++++++
 patches/rss2irc/1.0.5/series                  |  1 +
 2 files changed, 32 insertions(+)

diff --git a/patches/rss2irc/1.0.5/newer-http-conduit.diff b/patches/rss2irc/1.0.5/newer-http-conduit.diff
new file mode 100644
index 0000000..0caf89a
--- /dev/null
+++ b/patches/rss2irc/1.0.5/newer-http-conduit.diff
@@ -0,0 +1,31 @@
+--- a/rss2irc.cabal
++++ b/rss2irc.cabal
+@@ -36,7 +36,7 @@
+                     ,deepseq
+                     ,irc                   >= 0.5 && < 0.6
+                     ,feed                  >= 0.3.8 && < 0.3.9.2
+-                    ,http-conduit          >= 1.9 && < 2.0
++                    ,http-conduit          >= 1.9 && < 2.1
+                     ,resourcet             >= 0.4.4 && < 0.5
+                     ,http-types            >= 0.6.4 && < 0.9
+                     ,io-storage            >= 0.3 && < 0.4
+--- a/rss2irc.hs
++++ b/rss2irc.hs
+@@ -18,7 +18,7 @@
+ import Data.Time.Clock (getCurrentTime)
+ import Prelude hiding (log)
+ import Network (withSocketsDo)
+-import Network.HTTP.Conduit (newManager, def)
++import Network.HTTP.Conduit (newManager, conduitManagerSettings)
+ import System.Console.CmdArgs
+ import System.Exit (ExitCode(ExitSuccess), exitFailure, exitSuccess)
+ import System.IO
+@@ -70,7 +70,7 @@
+  withStore "globals" $ do -- for readFeedFile
+   -- http-conduit stuff
+   withSocketsDo $ do -- for ms windows
+-   manager <- io $ newManager Network.HTTP.Conduit.def
++   manager <- io $ newManager conduitManagerSettings
+    (opts,reader,bot) <- getRss2IrcArgs
+    let app = App{aOpts=opts,aReader=reader{httpManager=Just manager},aBot=bot}
+    when (delay opts > 0) $ threadDelay $ (delay opts) * minutes
diff --git a/patches/rss2irc/1.0.5/series b/patches/rss2irc/1.0.5/series
new file mode 100644
index 0000000..05f8b5a
--- /dev/null
+++ b/patches/rss2irc/1.0.5/series
@@ -0,0 +1 @@
+newer-http-conduit.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git