[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:
f998fe06 by Clint Adams at 2018-04-24T19:30:57-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-10) unstable; urgency=medium
+
+  * Untested patch to build with pandoc 2.x.
+
+ -- Clint Adams <clint at debian.org>  Tue, 24 Apr 2018 19:30:07 -0400
+
 xmonad (0.13-9) unstable; urgency=medium
 
   * Untested patch to build with pandoc 2.1.


=====================================
p/xmonad/debian/patches/newer-pandoc
=====================================
--- a/p/xmonad/debian/patches/newer-pandoc
+++ b/p/xmonad/debian/patches/newer-pandoc
@@ -17,8 +17,14 @@
  
  releaseDate = "31 December 2012"
  
-@@ -71,21 +72,23 @@
-     let manHeader = unwords [".TH xmonad 1","\""++releaseDate++"\"",releaseName,"\"xmonad manual\""]
+@@ -68,31 +69,35 @@
+     keybindings <- (intercalate "\n\n" . map markdownDefn . allBindings)
+                     `liftM` readFile "./src/XMonad/Config.hs"
+ 
+-    let manHeader = unwords [".TH xmonad 1","\""++releaseDate++"\"",releaseName,"\"xmonad manual\""]
++    let manHeader = T.pack .
++                    unwords
++                    $ [".TH xmonad 1","\""++releaseDate++"\"",releaseName,"\"xmonad manual\""]
  
      Right parsed <- readMarkdown def
 +        . T.pack
@@ -28,22 +34,32 @@
          <$> readFile "./man/xmonad.1.markdown"
  
 -    Right template <- getDefaultTemplate Nothing "man"
-+    Right template <- runPure getDefaultTemplate "man"
++    let Right mantemplate = runPure getDefaultTemplate "man"
++        Right htmltemplate = runPure getDefaultTemplate "html"
++
      writeFile "./man/xmonad.1"
-+        . T.unpack
-         . (manHeader ++)
-         . writeMan def{ writerTemplate = Just template }
+-        . (manHeader ++)
+-        . writeMan def{ writerTemplate = Just template }
++        . T.append manHeader
++        . writeMan def{ writerTemplate = Just mantemplate }
          $ parsed
      putStrLn "Documentation created: man/xmonad.1"
  
 -    Right template <- getDefaultTemplate Nothing "html"
-+    Right template <- runPure getDefaultTemplate "html"
      writeFile "./man/xmonad.1.html"
 -        . writeHtmlString def
 +        . writeHtml5String def
              { writerVariables =
                          [("include-before"
                              ,"<h1>"++releaseName++"</h1>"++
+                              "<p>Section: xmonad manual (1)<br/>"++
+                              "Updated: "++releaseDate++"</p>"++
+                              "<hr/>")]
+-            , writerTemplate = Just template
++            , writerTemplate = Just htmltemplate
+             , writerTableOfContents = True }
+         $ parsed
+     putStrLn "Documentation created: man/xmonad.1.html"
 --- a/xmonad.cabal
 +++ b/xmonad.cabal
 @@ -113,7 +113,7 @@
@@ -51,7 +67,7 @@
          build-depends: base,
                         Cabal,
 -                       pandoc,
-+                       pandoc >= 2.1,
++                       pandoc >= 2,
                         pretty,
                         regex-posix
      else



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

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/f998fe0615266cac37b8c0c8c9a55c0eb4f1e8d6
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/20180424/645be051/attachment-0001.html>