[DHG_packages] 05/05: darcs-monitor: Fix whitespace in patches

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository DHG_packages.

commit 6a995bdba68edc97ed44a48874329bcc3c5eaa2a
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Aug 11 14:09:36 2015 +0200

    darcs-monitor: Fix whitespace in patches
---
 p/darcs-monitor/debian/patches/catch             |  8 ++++----
 p/darcs-monitor/debian/patches/haxml-2.22-compat | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/p/darcs-monitor/debian/patches/catch b/p/darcs-monitor/debian/patches/catch
index 02b92f4..1072a6a 100644
--- a/p/darcs-monitor/debian/patches/catch
+++ b/p/darcs-monitor/debian/patches/catch
@@ -15,11 +15,11 @@ Index: darcs-monitor-0.4.2/darcs-monitor.hs
  import Text.XML.HaXml hiding (when,version,x,tag,cdata)
  import Text.XML.HaXml.Posn
 +import Control.Exception (catch, IOException)
-
+ 
  import Config
  import Darcs
 @@ -182,9 +184,9 @@
-
+ 
  readSeenPatches :: MonadIO m => String -> m SeenPatches
  readSeenPatches repo =
 -  liftIO $ catch (do fc <- readFile (repo ++ seenPatchesFileName)
@@ -28,6 +28,6 @@ Index: darcs-monitor-0.4.2/darcs-monitor.hs
 +  liftIO $ Control.Exception.catch (do fc <- readFile (repo ++ seenPatchesFileName)
 +                                       return (read fc)
 +                 ) $ \(_::IOException) -> return Map.empty
-
-
+ 
+ 
  processRepo :: (MonadConfig m, MonadIO m) => Bool -> Command m -> FilePath -> m ()
diff --git a/p/darcs-monitor/debian/patches/haxml-2.22-compat b/p/darcs-monitor/debian/patches/haxml-2.22-compat
index ac402c8..028bf37 100644
--- a/p/darcs-monitor/debian/patches/haxml-2.22-compat
+++ b/p/darcs-monitor/debian/patches/haxml-2.22-compat
@@ -8,7 +8,7 @@ Index: darcs-monitor-0.4.2/darcs-monitor.cabal
 +++ darcs-monitor-0.4.2/darcs-monitor.cabal	2015-06-11 10:38:04.772409588 +0200
 @@ -28,7 +28,7 @@
    description: Choose the new smaller, split-up base package.
-
+ 
  Executable darcs-monitor
 -  Build-Depends: mtl, HaXml == 1.20.*
 +  Build-Depends: mtl, HaXml >= 1.25 && <= 1.26
@@ -23,17 +23,17 @@ Index: darcs-monitor-0.4.2/darcs-monitor.hs
    liftIO $ createDirectoryIfMissing True (repo++dir)
    seenPatches <- readSeenPatches repo
    xml <- invokeDarcs ["changes", "--reverse", "--repo="++repo,"--xml-output","-a"]
--  let Document _ _ (Elem "changelog" _ content) _ = xmlParse repo xml
-+  let Document _ _ (Elem (N "changelog") _ content) _ = xmlParse repo xml
+-  let Document _ _ (Elem "changelog" _ content) _ = xmlParse repo xml 
++  let Document _ _ (Elem (N "changelog") _ content) _ = xmlParse repo xml 
    let patches
          = filter (\c -> case c of CElem _e _ -> True ; _ -> False) content
--  spl <- forM patches $ \ (CElem (Elem "patch" attrs content_) _) ->
+-  spl <- forM patches $ \ (CElem (Elem "patch" attrs content_) _) -> 
 -      do let author = getAttr "author" attrs
 -             localDate = getAttr "local_date" attrs
 -             hash = getAttr "hash" attrs
 -             name = getElem "name" content_
 -             comment = getElem "comment" content_
-+  spl <- forM patches $ \ (CElem (Elem (N "patch") attrs content_) _) ->
++  spl <- forM patches $ \ (CElem (Elem (N "patch") attrs content_) _) -> 
 +      do let author = getAttr (N "author") attrs
 +             localDate = getAttr (N "local_date") attrs
 +             hash = getAttr (N "hash") attrs
@@ -45,7 +45,7 @@ Index: darcs-monitor-0.4.2/darcs-monitor.hs
 @@ -251,7 +251,7 @@
                                       massage ss
            massage [] = id
-
+ 
 -getElem :: Name -> [Content Posn] -> String
 +getElem :: QName -> [Content Posn] -> String
  getElem name (CElem (Elem name' _ content) _ : _rest)

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