summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-09-23 22:53:34 +0200
committerJonas Smedegaard <dr@jones.dk>2017-09-23 22:53:34 +0200
commit5f74343036f05af6fb01d041f0bd85224bb760bc (patch)
tree1bdb6c34504b137fafc2c122cc44fea1bd74e232 /debian/patches
parenta5b0bb59848aa3442a570be0ac89a5e7dd063258 (diff)
Extend upstream cherry-picked patch for using recent skylighting to cover more entries.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/020170322~e30a257.patch12
1 files changed, 9 insertions, 3 deletions
diff --git a/debian/patches/020170322~e30a257.patch b/debian/patches/020170322~e30a257.patch
index 2b51944d5..0cbef7ac7 100644
--- a/debian/patches/020170322~e30a257.patch
+++ b/debian/patches/020170322~e30a257.patch
@@ -1,8 +1,9 @@
Description: Use skylighitng >= 0.3.3.
+ (patch extended to cover additional entries)
Origin: upstream, https://github.com/jgm/pandoc/commit/e30a257
Author: John MacFarlane <jgm@berkeley.edu>
Forwarded: yes
-Last-Update: 2017-08-01
+Last-Update: 2017-09-23
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pandoc.cabal
@@ -16,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
data-default >= 0.4 && < 0.8,
temporary >= 1.1 && < 1.3,
blaze-html >= 0.5 && < 0.10,
-@@ -435,7 +435,7 @@
+@@ -435,11 +435,11 @@
text >= 0.11 && < 1.3,
bytestring >= 0.9 && < 0.11,
extensible-exceptions >= 0.1 && < 0.2,
@@ -25,7 +26,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
aeson >= 0.7.0.5 && < 1.2,
yaml >= 0.8.8.2 && < 0.9,
containers >= 0.1 && < 0.6,
-@@ -510,7 +510,7 @@
+- skylighting >= 0.1.1.4 && < 0.2,
++ skylighting >= 0.3.3 && < 0.4,
+ texmath >= 0.9 && < 0.10,
+ HTTP >= 4000.0.5 && < 4000.4
+ if flag(network-uri)
+@@ -512,7 +512,7 @@
directory >= 1 && < 1.4,
filepath >= 1.1 && < 1.5,
process >= 1 && < 1.7,