[Pkg-haskell-commits] darcs: rss2irc: New upstream release

[Joachim Breitner]

Mon Apr 14 20:50:36 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release

    M ./changelog +6
    M ./control -2 +4
    R ./patches/newer-http-conduit.diff
    R ./patches/series
    R ./patches/

Mon Apr 14 20:50:36 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release
diff -rN -u old-rss2irc/changelog new-rss2irc/changelog
--- old-rss2irc/changelog	2014-04-14 20:51:34.259332391 +0000
+++ new-rss2irc/changelog	2014-04-14 20:51:34.263332391 +0000
@@ -1,3 +1,9 @@
+rss2irc (1.0.6-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 14 Apr 2014 22:48:16 +0200
+
 rss2irc (1.0.5-1) unstable; urgency=low
 
   [ Joachim Breitner ]
diff -rN -u old-rss2irc/control new-rss2irc/control
--- old-rss2irc/control	2014-04-14 20:51:34.259332391 +0000
+++ new-rss2irc/control	2014-04-14 20:51:34.259332391 +0000
@@ -13,8 +13,10 @@
   , libghc-cmdargs-dev
   , libghc-irc-dev (>> 0.5)
   , libghc-irc-dev (<< 0.6)
-  , libghc-feed-dev (>= 0.3.8)
-  , libghc-feed-dev (<< 0.4)
+  , libghc-feed-dev (>= 0.3.9)
+  , libghc-feed-dev (<< 0.4.10)
+  , libghc-http-client-dev (>> 0.2.1)
+  , libghc-http-client-dev (<< 0.2.3)
   , libghc-http-conduit-dev (>> 1.9)
   , libghc-http-conduit-dev (<< 2.1)
   , libghc-http-types-dev (>= 0.6.4)
diff -rN -u old-rss2irc/patches/newer-http-conduit.diff new-rss2irc/patches/newer-http-conduit.diff
--- old-rss2irc/patches/newer-http-conduit.diff	2014-04-14 20:51:34.259332391 +0000
+++ new-rss2irc/patches/newer-http-conduit.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
---- 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-rss2irc/patches/series new-rss2irc/patches/series
--- old-rss2irc/patches/series	2014-04-14 20:51:34.259332391 +0000
+++ new-rss2irc/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-newer-http-conduit.diff