xmonad: drop older-pandoc patch

3 files changed, 6 insertions, 23 deletions

diff --git a/p/xmonad/debian/changelog b/p/xmonad/debian/changelog
index a9b34af9a..a1c87fdd1 100644
--- a/p/xmonad/debian/changelog
+++ b/p/xmonad/debian/changelog
@@ -1,3 +1,9 @@
+xmonad (0.13-3) unstable; urgency=medium
+
+  * Drop older-pandoc patch.
+
+ -- Clint Adams <clint@debian.org>  Fri, 21 Jul 2017 18:36:35 -0400
+
 xmonad (0.13-2) unstable; urgency=medium
 
   * Patch to build with pandoc older than 1.19.  closes: #867386.
diff --git a/p/xmonad/debian/patches/older-pandoc b/p/xmonad/debian/patches/older-pandoc
deleted file mode 100644
index 90627b0ba..000000000
--- a/p/xmonad/debian/patches/older-pandoc
+++ /dev/null
@@ -1,22 +0,0 @@
-The API for this changed in pandoc 1.19, which we do not have yet.
-
---- a/util/GenerateManpage.hs
-+++ b/util/GenerateManpage.hs
-@@ -79,7 +79,7 @@
-     Right template <- getDefaultTemplate Nothing "man"
-     writeFile "./man/xmonad.1"
-         . (manHeader ++)
--        . writeMan def{ writerTemplate = Just template }
-+        . writeMan def{ writerTemplate = template }
-         $ parsed
-     putStrLn "Documentation created: man/xmonad.1"
- 
-@@ -92,7 +92,7 @@
-                              "<p>Section: xmonad manual (1)<br/>"++
-                              "Updated: "++releaseDate++"</p>"++
-                              "<hr/>")]
--            , writerTemplate = Just template
-+            , writerTemplate = template
-             , writerTableOfContents = True }
-         $ parsed
-     putStrLn "Documentation created: man/xmonad.1.html"
diff --git a/p/xmonad/debian/patches/series b/p/xmonad/debian/patches/series
index fd8bb4be2..1863ecb6d 100644
--- a/p/xmonad/debian/patches/series
+++ b/p/xmonad/debian/patches/series
@@ -1,3 +1,2 @@
 use_x-terminal-emulator.patch
 #haddock-fixes.patch
-older-pandoc