[Git][haskell-team/DHG_packages][master] xmonad: untested patch to build with pandoc 2.x.

[Clint Adams]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
b098f32c by Clint Adams at 2018-04-24T21:23:09-04:00
xmonad: untested patch to build with pandoc 2.x.

- - - - -


2 changed files:

- p/xmonad/debian/changelog
- p/xmonad/debian/patches/newer-pandoc


Changes:

=====================================
p/xmonad/debian/changelog
=====================================
--- a/p/xmonad/debian/changelog
+++ b/p/xmonad/debian/changelog
@@ -1,3 +1,9 @@
+xmonad (0.13-12) unstable; urgency=medium
+
+  * Untested patch to build with pandoc 2.x.
+
+ -- Clint Adams <clint at debian.org>  Tue, 24 Apr 2018 21:22:35 -0400
+
 xmonad (0.13-11) unstable; urgency=medium
 
   * Untested patch to build with pandoc 2.x.


=====================================
p/xmonad/debian/patches/newer-pandoc
=====================================
--- a/p/xmonad/debian/patches/newer-pandoc
+++ b/p/xmonad/debian/patches/newer-pandoc
@@ -1,15 +1,16 @@
 --- a/util/GenerateManpage.hs
 +++ b/util/GenerateManpage.hs
-@@ -27,6 +27,8 @@
+@@ -27,6 +27,9 @@
  import Text.Regex.Posix
  import Data.Char
  import Data.List
-+import qualified Data.Text as T
 +import Control.Monad.IO.Class (liftIO)
++import qualified Data.Text as T
++import qualified Data.Text.IO as TIO
  
  import Distribution.PackageDescription.Parse
  import Distribution.Verbosity
-@@ -35,7 +37,7 @@
+@@ -35,7 +38,7 @@
  import Text.PrettyPrint.HughesPJ
  import Distribution.Text
  
@@ -18,7 +19,7 @@
  
  releaseDate = "31 December 2012"
  
-@@ -68,31 +70,32 @@
+@@ -68,31 +71,32 @@
      keybindings <- (intercalate "\n\n" . map markdownDefn . allBindings)
                      `liftM` readFile "./src/XMonad/Config.hs"
  
@@ -60,16 +61,16 @@
 +            . unlines
 +            . replace "___KEYBINDINGS___" keybindings
 +            . lines
-+            <$> readFile "./man/xmonad.1.markdown"
++            <$> liftIO (readFile "./man/xmonad.1.markdown")
 +
 +        manTemplate <- getDefaultTemplate "man"
 +        manBody <- writeMan def { writerTemplate = Just manTemplate } parsed
-+        liftIO $ writeFile "./man/xmonad.1" $ T.append manHeader manBody
++        liftIO $ TIO.writeFile "./man/xmonad.1" $ T.append manHeader manBody
 +        liftIO $ putStrLn "Documentation created: man/xmonad.1"
 +
 +        htmltemplate <- getDefaultTemplate "html"
 +        htmlBody <- writeHtml5String def
-+                { writerVariables = map T.pack
++                { writerVariables =
 +                            [("include-before"
 +                                ,"<h1>"++releaseName++"</h1>"++
 +                                 "<p>Section: xmonad manual (1)<br/>"++
@@ -77,7 +78,7 @@
 +                                 "<hr/>")]
 +                , writerTemplate = Just htmltemplate
 +                , writerTableOfContents = True } parsed
-+        liftIO $ writeFile "./man/xmonad.1.html" htmlBody
++        liftIO $ TIO.writeFile "./man/xmonad.1.html" htmlBody
 +        liftIO $ putStrLn "Documentation created: man/xmonad.1.html"
 --- a/xmonad.cabal
 +++ b/xmonad.cabal



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/b098f32c034d994869c8e29cbe9207cd74502248

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/b098f32c034d994869c8e29cbe9207cd74502248
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180425/ea241fa2/attachment-0001.html>