[Pkg-haskell-commits] darcs: hbro: Merge previous two uploads (forgot to pull); drop patches.

[Joachim Breitner]

Fri Apr  4 07:58:04 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Merge previous two uploads (forgot to pull); drop patches. 

    R ./patches/better-readability-check.diff
    R ./patches/series
    R ./patches/
    M ./changelog +6

Fri Apr  4 07:58:04 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Merge previous two uploads (forgot to pull); drop patches. 
diff -rN -u old-hbro/changelog new-hbro/changelog
--- old-hbro/changelog	2014-04-04 08:01:02.488478869 +0000
+++ new-hbro/changelog	2014-04-04 08:01:02.492478867 +0000
@@ -1,3 +1,9 @@
+hbro (1.1.2.2-2) UNRELEASED; urgency=medium
+
+  * Merge previous two uploads (forgot to pull); drop patches. 
+
+ -- Joachim Breitner <nomeata at debian.org>  Fri, 04 Apr 2014 09:57:45 +0200
+
 hbro (1.1.2.2-1) unstable; urgency=low
 
   * Fix path to test whether -threaded is supported by GHC
diff -rN -u old-hbro/patches/better-readability-check.diff new-hbro/patches/better-readability-check.diff
--- old-hbro/patches/better-readability-check.diff	2014-04-04 08:01:02.488478869 +0000
+++ new-hbro/patches/better-readability-check.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-diff -r b1e52e37899e -r 1c4bcc89f95f Hbro/Boot.hs
---- a/Hbro/Boot.hs	Sun Mar 31 14:40:25 2013 +0200
-+++ b/Hbro/Boot.hs	Wed Oct 09 00:23:16 2013 -0400
-@@ -119,10 +119,12 @@
-   where
-     firstReadableOf []    = return Nothing
-     firstReadableOf (x:y) = do
--        isReadable <- fileAccess x True False False
-+        isThere <- fileExist x
-+	isReadable <- case isThere of
-+	    False -> return False
-+            True -> fileAccess x True False False
-         isReadable ? return (Just x) ?? firstReadableOf y
- 
--
- withIPC :: (MonadBaseControl IO m) => CliOptions -> (IPC -> m a) -> m a
- withIPC options f = restoreM =<< (liftBaseWith $ \runInIO -> do
-   ZMQ.withContext $ \c -> do
diff -rN -u old-hbro/patches/series new-hbro/patches/series
--- old-hbro/patches/series	2014-04-04 08:01:02.488478869 +0000
+++ new-hbro/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-better-readability-check.diff