[DHG_packages] 01/05: Adjust util/GenerateManpage.hs to latest pandoc

[Joachim Breitner]

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

nomeata pushed a commit to branch st3
in repository DHG_packages.

commit 1be0a2448c1b8dc37d3179d6e3614eb49edaceff
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Aug 19 16:49:49 2015 +0200

    Adjust util/GenerateManpage.hs to latest pandoc
---
 p/xmonad/debian/patches/fix-GenerateManpage | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/p/xmonad/debian/patches/fix-GenerateManpage b/p/xmonad/debian/patches/fix-GenerateManpage
index 476553f..76690c0 100644
--- a/p/xmonad/debian/patches/fix-GenerateManpage
+++ b/p/xmonad/debian/patches/fix-GenerateManpage
@@ -1,24 +1,29 @@
-Index: xmonad-0.11/util/GenerateManpage.hs
+Index: xmonad/util/GenerateManpage.hs
 ===================================================================
---- xmonad-0.11.orig/util/GenerateManpage.hs	2013-01-01 02:31:47.000000000 +0100
-+++ xmonad-0.11/util/GenerateManpage.hs	2013-02-17 17:01:53.186736898 +0100
-@@ -26,6 +26,7 @@
+--- xmonad.orig/util/GenerateManpage.hs	2015-08-19 16:35:34.888424481 +0200
++++ xmonad/util/GenerateManpage.hs	2015-08-19 16:36:29.285364470 +0200
+@@ -1,3 +1,4 @@
++{-# LANGUAGE FlexibleContexts #-}
+ -- Unlike the rest of xmonad, this file is copyright under the terms of the
+ -- GPL.
+ 
+@@ -26,6 +27,7 @@
  import Text.Regex.Posix
  import Data.Char
  import Data.List
 +import qualified Data.Set as Set
-
+ 
  import Distribution.PackageDescription.Parse
  import Distribution.Verbosity
-@@ -68,9 +69,9 @@
+@@ -68,9 +70,9 @@
                      `liftM` readFile "./XMonad/Config.hs"
-
+ 
      let manHeader = unwords [".TH xmonad 1","\""++releaseDate++"\"",releaseName,"\"xmonad manual\""]
 -        writeOpts = defaultWriterOptions -- { writerLiterateHaskell = True }
 +        writeOpts = def -- { writerLiterateHaskell = True }
-
+ 
 -    parsed <- readMarkdown defaultParserState { stateLiterateHaskell = True }
-+    parsed <- readMarkdown def { readerExtensions = Set.insert Ext_literate_haskell pandocExtensions }
++    Right parsed <- readMarkdown def { readerExtensions = Set.insert Ext_literate_haskell pandocExtensions }
          . unlines
          . replace "___KEYBINDINGS___" keybindings
          . lines

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