[Pkg-haskell-commits] darcs: hbro: Bug fixes.

[Clint Adams]

Thu Oct 10 02:28:37 UTC 2013  Clint Adams <clint at debian.org>
  * Bug fixes.

    M ./changelog -2 +8
    M ./control +1
    A ./patches/
    A ./patches/better-readability-check.diff
    A ./patches/series

Thu Oct 10 02:28:37 UTC 2013  Clint Adams <clint at debian.org>
  * Bug fixes.
diff -rN -u old-hbro/changelog new-hbro/changelog
--- old-hbro/changelog	2013-10-10 02:30:40.181624127 +0000
+++ new-hbro/changelog	2013-10-10 02:30:40.185564518 +0000
@@ -1,8 +1,14 @@
-hbro (1.1.2.0-2) UNRELEASED; urgency=low
+hbro (1.1.2.0-2) unstable; urgency=low
 
+  [ Joachim Breitner ]
   * Adjust watch file to new hackage layout
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 05 Oct 2013 18:22:24 +0200
+  [ Clint Adams ]
+  * Patch readability check so hbro will start without ui.xml in the
+    user's config directory.  closes: #725841.
+  * Change hbro section to web.  closes: #663709.
+
+ -- Clint Adams <clint at debian.org>  Wed, 09 Oct 2013 22:06:05 -0400
 
 hbro (1.1.2.0-1) unstable; urgency=low
 
diff -rN -u old-hbro/control new-hbro/control
--- old-hbro/control	2013-10-10 02:30:40.151331898 +0000
+++ new-hbro/control	2013-10-10 02:30:40.189763337 +0000
@@ -61,6 +61,7 @@
 
 Package: hbro
 Architecture: any
+Section: web
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
   , ${misc:Depends}
diff -rN -u old-hbro/patches/better-readability-check.diff new-hbro/patches/better-readability-check.diff
--- old-hbro/patches/better-readability-check.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-hbro/patches/better-readability-check.diff	2013-10-10 02:30:40.189763337 +0000
@@ -0,0 +1,18 @@
+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	1970-01-01 00:00:00.000000000 +0000
+++ new-hbro/patches/series	2013-10-10 02:30:40.189763337 +0000
@@ -0,0 +1 @@
+better-readability-check.diff