[Pkg-haskell-commits] darcs: tools: Actually add rss2irc patches

[Clint Adams]

Tue Mar  4 18:41:55 UTC 2014  Clint Adams <clint at debian.org>
  * Actually add rss2irc patches

    A ./all-packages/patches/rss2irc/1.0.5/newer-http-conduit.diff
    A ./all-packages/patches/rss2irc/1.0.5/series

Tue Mar  4 18:41:55 UTC 2014  Clint Adams <clint at debian.org>
  * Actually add rss2irc patches
diff -rN -u old-tools/all-packages/patches/rss2irc/1.0.5/newer-http-conduit.diff new-tools/all-packages/patches/rss2irc/1.0.5/newer-http-conduit.diff
--- old-tools/all-packages/patches/rss2irc/1.0.5/newer-http-conduit.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-tools/all-packages/patches/rss2irc/1.0.5/newer-http-conduit.diff	2014-03-04 18:42:28.141094044 +0000
@@ -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 -rN -u old-tools/all-packages/patches/rss2irc/1.0.5/series new-tools/all-packages/patches/rss2irc/1.0.5/series
--- old-tools/all-packages/patches/rss2irc/1.0.5/series	1970-01-01 00:00:00.000000000 +0000
+++ new-tools/all-packages/patches/rss2irc/1.0.5/series	2014-03-04 18:42:28.145094043 +0000
@@ -0,0 +1 @@
+newer-http-conduit.diff