summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-04-24 10:52:23 -0700
committerSean Whitton <spwhitton@spwhitton.name>2018-04-24 10:57:01 -0700
commitc5d49cd50a83e944d161769cbed474b50e60f904 (patch)
tree6fdf32a69f4039eda7881916bd92f6ced79a3cb1
parentb55427c8088483a81e94ac86aa5098c708ab40b4 (diff)
Drop patches merged upstream
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/020170322~e30a257.patch42
-rw-r--r--debian/patches/020170515~e01e2d0.patch28
-rw-r--r--debian/patches/series2
4 files changed, 1 insertions, 72 deletions
diff --git a/debian/changelog b/debian/changelog
index 930e9ff..11dd49b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ pandoc (2.1.2~dfsg-1) UNRELEASED; urgency=medium
[ Sean Whitton ]
* Team upload.
* New upstream release (Closes: #891243).
+ * Drop patches merged upstream.
* Point Vcs-* at salsa.
-- Sean Whitton <spwhitton@spwhitton.name> Tue, 24 Apr 2018 10:49:44 -0700
diff --git a/debian/patches/020170322~e30a257.patch b/debian/patches/020170322~e30a257.patch
deleted file mode 100644
index 0cbef7a..0000000
--- a/debian/patches/020170322~e30a257.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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-09-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/pandoc.cabal
-+++ b/pandoc.cabal
-@@ -279,7 +279,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,
-@@ -435,11 +435,11 @@
- text >= 0.11 && < 1.3,
- bytestring >= 0.9 && < 0.11,
- extensible-exceptions >= 0.1 && < 0.2,
-- skylighting >= 0.1.1.5 && < 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,
-- 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,
-- skylighting >= 0.1.1.3 && < 0.2,
-+ skylighting >= 0.3.3 && < 0.4,
- Diff >= 0.2 && < 0.4,
- test-framework >= 0.3 && < 0.9,
- test-framework-hunit >= 0.2 && < 0.4,
diff --git a/debian/patches/020170515~e01e2d0.patch b/debian/patches/020170515~e01e2d0.patch
deleted file mode 100644
index d2bd949..0000000
--- a/debian/patches/020170515~e01e2d0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 8934784..3d14f7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-020170322~e30a257.patch
-020170515~e01e2d0.patch
1001_online_latexmathml_default.patch
2001_avoid_missing_files.patch