[Pkg-haskell-commits] darcs: xmonad: debian/patches/fix-GenerateManpage: Pandoc compatibility.

[Joachim Breitner]

Sun Feb 17 16:04:06 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * debian/patches/fix-GenerateManpage: Pandoc compatibility. 
  Ignore-this: c4358abb9285a0d8e96a41c5f525c747

    M ./changelog +6
    M ./control -1 +1
    A ./patches/fix-GenerateManpage
    M ./patches/series +1

Sun Feb 17 16:04:06 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * debian/patches/fix-GenerateManpage: Pandoc compatibility. 
  Ignore-this: c4358abb9285a0d8e96a41c5f525c747
diff -rN -u old-xmonad//changelog new-xmonad//changelog
--- old-xmonad//changelog	2013-02-17 16:07:26.751720760 +0000
+++ new-xmonad//changelog	2013-02-17 16:07:26.771725720 +0000
@@ -1,3 +1,9 @@
+xmonad (0.11-2) UNRELEASED; urgency=low
+
+  * debian/patches/fix-GenerateManpage: Pandoc compatibility. 
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 17 Feb 2013 17:03:09 +0100
+
 xmonad (0.11-1) experimental; urgency=low
 
   [ Joachim Breitner ]
diff -rN -u old-xmonad//control new-xmonad//control
--- old-xmonad//control	2013-02-17 16:07:26.751720760 +0000
+++ new-xmonad//control	2013-02-17 16:07:26.755720578 +0000
@@ -23,7 +23,7 @@
  libghc-utf8-string-dev (>= 0.3),
  libghc-utf8-string-dev (<< 0.4),
  libghc-utf8-string-prof,
- libghc-pandoc-dev,
+ libghc-pandoc-dev (>= 1.10),
  libghc-regex-posix-dev,
 # temporary cludge until #697306 is resolved.
  pandoc (>= 1.9.4.5)
diff -rN -u old-xmonad//patches/fix-GenerateManpage new-xmonad//patches/fix-GenerateManpage
--- old-xmonad//patches/fix-GenerateManpage	1970-01-01 00:00:00.000000000 +0000
+++ new-xmonad//patches/fix-GenerateManpage	2013-02-17 16:07:26.759722702 +0000
@@ -0,0 +1,24 @@
+Index: xmonad-0.11/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 @@
+ 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 @@
+                     `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 }
+         . unlines
+         . replace "___KEYBINDINGS___" keybindings
+         . lines
diff -rN -u old-xmonad//patches/series new-xmonad//patches/series
--- old-xmonad//patches/series	2013-02-17 16:07:26.751720760 +0000
+++ new-xmonad//patches/series	2013-02-17 16:07:26.763723919 +0000
@@ -1,2 +1,3 @@
+fix-GenerateManpage
 use_x-terminal-emulator.patch
 #haddock-fixes.patch