Unfuzz patches.

3 files changed, 39 insertions, 24 deletions

diff --git a/debian/patches/1001_online_latexmathml_default.patch b/debian/patches/1001_online_latexmathml_default.patch
index 5be5b2b23..41faa6b7c 100644
--- a/debian/patches/1001_online_latexmathml_default.patch
+++ b/debian/patches/1001_online_latexmathml_default.patch
@@ -4,7 +4,7 @@ Last-Update: 2016-06-01
 
 --- a/pandoc.hs
 +++ b/pandoc.hs
-@@ -797,8 +797,11 @@
+@@ -818,8 +818,11 @@
  
      , Option "m" ["latexmathml", "asciimathml"]
                   (OptArg
@@ -18,19 +18,33 @@ Last-Update: 2016-06-01
                    "URL")
                   "" -- "Use LaTeXMathML script in html output"
  
-@@ -1235,9 +1238,6 @@
+@@ -1315,12 +1318,6 @@
+                                                      in throwIO e')
                                         else throwIO e)
  
-   variables' <- case mathMethod of
+-  variables' <- case mathMethod of
 -                      LaTeXMathML Nothing -> do
 -                         s <- readDataFileUTF8 datadir "LaTeXMathML.js"
 -                         return $ ("mathml-script", s) : variables
-                       MathML Nothing -> do
-                          s <- readDataFileUTF8 datadir "MathMLinHTML.js"
-                          return $ ("mathml-script", s) : variables
+-                      _ -> return variables
+-
+   variables'' <- if format == "dzslides"
+                     then do
+                         dztempl <- readDataFileUTF8 datadir
+@@ -1329,8 +1326,8 @@
+                         let dzcore = unlines
+                                    $ dropWhile (not . (dzline `isPrefixOf`))
+                                    $ lines dztempl
+-                        return $ ("dzslides-core", dzcore) : variables'
+-                    else return variables'
++                        return $ ("dzslides-core", dzcore) : variables
++                    else return variables
+ 
+   let sourceURL = case sources of
+                     []    -> Nothing
 --- a/src/Text/Pandoc/Options.hs
 +++ b/src/Text/Pandoc/Options.hs
-@@ -291,7 +291,7 @@
+@@ -299,7 +299,7 @@
  data EPUBVersion = EPUB2 | EPUB3 deriving (Eq, Show, Read, Data, Typeable, Generic)
  
  data HTMLMathMethod = PlainMath
@@ -41,7 +55,7 @@ Last-Update: 2016-06-01
                      | WebTeX String               -- url of TeX->image script.
 --- a/src/Text/Pandoc/Writers/HTML.hs
 +++ b/src/Text/Pandoc/Writers/HTML.hs
-@@ -141,7 +141,7 @@
+@@ -142,7 +142,7 @@
    let notes = reverse (stNotes st)
    let thebody = blocks' >> footnoteSection opts notes
    let  math = case writerHTMLMathMethod opts of
@@ -52,7 +66,7 @@ Last-Update: 2016-06-01
                                    $ mempty
 --- a/man/pandoc.1
 +++ b/man/pandoc.1
-@@ -1035,14 +1035,10 @@
+@@ -1105,14 +1105,10 @@
  .SS Math rendering in HTML
  .TP
  .B \f[C]\-m\f[] [\f[I]URL\f[]], \f[C]\-\-latexmathml\f[][\f[C]=\f[]\f[I]URL\f[]]
diff --git a/debian/patches/2001_avoid_missing_files.patch b/debian/patches/2001_avoid_missing_files.patch
index 62f670866..4a229ef6d 100644
--- a/debian/patches/2001_avoid_missing_files.patch
+++ b/debian/patches/2001_avoid_missing_files.patch
@@ -4,15 +4,16 @@ Last-Update: 2016-06-01
 
 --- a/pandoc.cabal
 +++ b/pandoc.cabal
-@@ -96,7 +96,6 @@
+@@ -95,8 +95,6 @@
+                  data/odt/META-INF/manifest.xml
                    -- stylesheet for EPUB writer
                   data/epub.css
-                  -- data for LaTeXMathML writer
+-                 -- data for LaTeXMathML writer
 -                 data/LaTeXMathML.js
-                  data/MathMLinHTML.js
                   -- data for dzslides writer
                   data/dzslides/template.html
-@@ -142,7 +141,6 @@
+                  -- sample lua custom writer
+@@ -141,7 +139,6 @@
                   tests/mediawiki-reader.wiki
                   tests/rst-reader.rst
                   tests/s5-basic.html
@@ -22,7 +23,7 @@ Last-Update: 2016-06-01
                   tests/tables.context
 --- a/tests/Tests/Old.hs
 +++ b/tests/Tests/Old.hs
-@@ -91,7 +91,6 @@
+@@ -92,7 +92,6 @@
            ]
          , testGroup "s5"
            [ s5WriterTest "basic" ["-s"] "s5"
diff --git a/debian/patches/2003_bump_directory_bounds.patch b/debian/patches/2003_bump_directory_bounds.patch
index 7fa07883b..4564b64f3 100644
--- a/debian/patches/2003_bump_directory_bounds.patch
+++ b/debian/patches/2003_bump_directory_bounds.patch
@@ -1,10 +1,10 @@
 Description: Bump directory bounds on buildds.
 Author: Bhavani Shankar <bhavi@ubuntu.com>
 
---- pandoc-1.17.2~dfsg.orig/pandoc.cabal
-+++ pandoc-1.17.2~dfsg/pandoc.cabal
-@@ -256,7 +256,7 @@ Library
-                  mtl >= 1.1 && < 2.3,
+--- a/pandoc.cabal
++++ b/pandoc.cabal
+@@ -258,7 +258,7 @@
+                  mtl >= 2.2 && < 2.3,
                   filepath >= 1.1 && < 1.5,
                   process >= 1 && < 1.5,
 -                 directory >= 1 && < 1.3,
@@ -12,17 +12,17 @@ Author: Bhavani Shankar <bhavi@ubuntu.com>
                   bytestring >= 0.9 && < 0.11,
                   text >= 0.11 && < 1.3,
                   zip-archive >= 0.2.3.4 && < 0.4,
-@@ -424,7 +424,7 @@ Executable pandoc
+@@ -423,7 +423,7 @@
    Build-Depends: pandoc,
-                  pandoc-types >= 1.16 && < 1.17,
+                  pandoc-types >= 1.17 && < 1.18,
                   base >= 4.2 && <5,
--                 directory >= 1 && < 1.3,
-+                 directory >= 1 && < 1.4,
+-                 directory >= 1.2 && < 1.3,
++                 directory >= 1.2 && < 1.4,
                   filepath >= 1.1 && < 1.5,
                   text >= 0.11 && < 1.3,
                   bytestring >= 0.9 && < 0.11,
-@@ -482,7 +482,7 @@ Test-Suite test-pandoc
-                   pandoc-types >= 1.16 && < 1.17,
+@@ -500,7 +500,7 @@
+                   pandoc-types >= 1.17 && < 1.18,
                    bytestring >= 0.9 && < 0.11,
                    text >= 0.11 && < 1.3,
 -                  directory >= 1 && < 1.3,