diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-08-01 11:04:14 -0400 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-08-01 11:04:14 -0400 |
| commit | 31c61294fc0cf000248e871d364ebd470bcd22e9 (patch) | |
| tree | 66cad37bbd71fa9179a236cdb35b56bf05788c25 /debian/patches | |
| parent | aa781210cb208faec9b476f4d254902e20329c45 (diff) | |
Add patches cherry-picked upstream to use newer skylighting and mention skylighting (not highlighting-kate) in manpage.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/020170322~e30a257.patch | 27 | ||||
| -rw-r--r-- | debian/patches/020170515~e01e2d0.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 57 insertions, 0 deletions
diff --git a/debian/patches/020170322~e30a257.patch b/debian/patches/020170322~e30a257.patch new file mode 100644 index 000000000..58c860b76 --- /dev/null +++ b/debian/patches/020170322~e30a257.patch @@ -0,0 +1,27 @@ +Description: Use skylighitng >= 0.3.3. +Origin: upstream, https://github.com/jgm/pandoc/commit/e30a257 +Author: John MacFarlane <jgm@berkeley.edu> +Forwarded: yes +Last-Update: 2017-08-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/pandoc.cabal ++++ b/pandoc.cabal +@@ -275,7 +275,7 @@ + tagsoup >= 0.13.7 && < 0.15, + base64-bytestring >= 0.1 && < 1.1, + zlib >= 0.5 && < 0.7, +- skylighting >= 0.1.1.4 && < 0.2, ++ skylighting >= 0.3.3 && < 0.4, + data-default >= 0.4 && < 0.8, + temporary >= 1.1 && < 1.3, + blaze-html >= 0.5 && < 0.10, +@@ -431,7 +431,7 @@ + text >= 0.11 && < 1.3, + bytestring >= 0.9 && < 0.11, + extensible-exceptions >= 0.1 && < 0.2, +- skylighting >= 0.1.1.3 && < 0.2, ++ skylighting >= 0.3.3 && < 0.4, + aeson >= 0.7.0.5 && < 1.2, + yaml >= 0.8.8.2 && < 0.9, + containers >= 0.1 && < 0.6, diff --git a/debian/patches/020170515~e01e2d0.patch b/debian/patches/020170515~e01e2d0.patch new file mode 100644 index 000000000..d2bd94906 --- /dev/null +++ b/debian/patches/020170515~e01e2d0.patch @@ -0,0 +1,28 @@ +Description: MANUAL: remove refs to highlighting-kate. +Origin: upstream, https://github.com/jgm/pandoc/commit/e01e2d0 +Author: John MacFarlane <jgm@berkeley.edu> +Forwarded: yes +Bug: https://github.com/jgm/pandoc/issues/3672 +Last-Update: 2017-08-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/MANUAL.txt ++++ b/MANUAL.txt +@@ -3956,7 +3956,7 @@ + =================== + + Pandoc will automatically highlight syntax in [fenced code blocks] that +-are marked with a language name. The Haskell library [highlighting-kate] is ++are marked with a language name. The Haskell library [skylighting] is + used for highlighting, which works in HTML, Docx, and LaTeX/PDF output. + To see a list of language names that pandoc will recognize, type + `pandoc --list-highlight-languages`. +@@ -3969,7 +3969,7 @@ + + To disable highlighting, use the `--no-highlight` option. + +-[highlighting-kate]: https://github.com/jgm/highlighting-kate ++[skylighting]: https://github.com/jgm/skylighting + + Custom Styles in Docx Output + ============================ diff --git a/debian/patches/series b/debian/patches/series index 3d14f7ba5..89347844f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ +020170322~e30a257.patch +020170515~e01e2d0.patch 1001_online_latexmathml_default.patch 2001_avoid_missing_files.patch |