Bug#1059146: haskell-pandoc: diff for NMU version 3.0.1-3.1
Jonas Smedegaard
dr at jones.dk
Thu Dec 21 23:58:58 GMT 2023
Control: tags 1059146 + patch
Control: tags 1059146 + pending
Dear maintainer,
I've prepared an NMU for haskell-pandoc (versioned as 3.0.1-3.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru haskell-pandoc-3.0.1/debian/changelog haskell-pandoc-3.0.1/debian/changelog
--- haskell-pandoc-3.0.1/debian/changelog 2023-12-06 17:21:57.000000000 +0100
+++ haskell-pandoc-3.0.1/debian/changelog 2023-12-21 21:20:26.000000000 +0100
@@ -1,3 +1,14 @@
+haskell-pandoc (3.0.1-3.1) unstable; urgency=medium
+
+ Non-maintainer update.
+
+ * revive and unfuzz patches lost in transition from src:pandoc:
+ + 2001: avoid potential privacy breaches in templates
+ closes: bug#1059146
+ + 2002: improve error message when pdf program is missing
+
+ -- Jonas Smedegaard <dr at jones.dk> Thu, 21 Dec 2023 21:20:26 +0100
+
haskell-pandoc (3.0.1-3) unstable; urgency=medium
* Apply upstream patch to fix FTBFS on 32-bit platforms
diff -Nru haskell-pandoc-3.0.1/debian/patches/2001_templates_avoid_privacy_breach.patch haskell-pandoc-3.0.1/debian/patches/2001_templates_avoid_privacy_breach.patch
--- haskell-pandoc-3.0.1/debian/patches/2001_templates_avoid_privacy_breach.patch 1970-01-01 01:00:00.000000000 +0100
+++ haskell-pandoc-3.0.1/debian/patches/2001_templates_avoid_privacy_breach.patch 2023-12-21 21:11:23.000000000 +0100
@@ -0,0 +1,138 @@
+Description: Avoid potential privacy breaches in templates
+Author: Jonas Smedegaard <dr at jones.dk>
+License: GPL-3+
+Last-Update: 2018-06-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/data/dzslides/template.html
++++ b/data/dzslides/template.html
+@@ -48,7 +48,7 @@
+
+ <section>
+ <figure> <!-- Figures are used to display images and videos fullpage -->
+- <img src="http://placekitten.com/g/800/600">
++ <img src="cat.png">
+ <figcaption>An image</figcaption>
+ </figure>
+ <div role="note">Kittens are so cute!</div>
+@@ -56,7 +56,7 @@
+
+ <section>
+ <figure> <!-- Videos are automatically played -->
+- <video src="http://videos-cdn.mozilla.net/brand/Mozilla_Firefox_Manifesto_v0.2_640.webm" poster="http://www.mozilla.org/images/about/poster.jpg"></video>
++ <video src="video.webm" poster="video.jpg"></video>
+ <figcaption>A video</figcaption>
+ </figure>
+ </section>
+@@ -68,16 +68,13 @@
+ <!-- Your Style -->
+ <!-- Define the style of your presentation -->
+
+-<!-- Maybe a font from http://www.google.com/webfonts ? -->
+-<link href='http://fonts.googleapis.com/css?family=Oswald' rel='stylesheet'>
+-
+ <style>
+ html, .view body { background-color: black; counter-reset: slideidx; }
+ body, .view section { background-color: white; border-radius: 12px }
+ /* A section is a slide. It's size is 800x600, and this will never change */
+ section, .view head > title {
+ /* The font from Google */
+- font-family: 'Oswald', arial, serif;
++ font-family: 'DejaVu Sans Condensed', 'Liberation Sans', 'Nimbus Sans L', arial, serif;
+ font-size: 30px;
+ }
+
+--- a/data/templates/default.dzslides
++++ b/data/templates/default.dzslides
+@@ -20,15 +20,12 @@
+ <link rel="stylesheet" href="$css$">
+ $endfor$
+ $else$
+-<link href='https://fonts.googleapis.com/css?family=Oswald' rel='stylesheet'>
+-
+ <style>
+ html, .view body { background-color: black; counter-reset: slideidx; }
+ body, .view section { background-color: white; border-radius: 12px }
+ /* A section is a slide. It's size is 800x600, and this will never change */
+ section, .view head > title {
+- /* The font from Google */
+- font-family: 'Oswald', arial, serif;
++ font-family: 'DejaVu Sans Condensed', 'Liberation Sans', 'Nimbus Sans L', arial, serif;
+ font-size: 30px;
+ }
+
+--- a/data/templates/default.html5
++++ b/data/templates/default.html5
+@@ -29,9 +29,6 @@
+ $if(math)$
+ $math$
+ $endif$
+- <!--[if lt IE 9]>
+- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+- <![endif]-->
+ </head>
+ <body>
+ $for(include-before)$
+--- a/src/Text/Pandoc/Options.hs
++++ b/src/Text/Pandoc/Options.hs
+@@ -370,10 +370,10 @@
+ isEnabled ext opts = ext `extensionEnabled` getExtensions opts
+
+ defaultMathJaxURL :: Text
+-defaultMathJaxURL = "https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml-full.js"
++defaultMathJaxURL = "/usr/share/javascript/mathjax/MathJax.js"
+
+ defaultKaTeXURL :: Text
+-defaultKaTeXURL = "https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/"
++defaultKaTeXURL = "/usr/share/javascript/katex/"
+
+ -- Update documentation in doc/filters.md if this is changed.
+ $(deriveJSON defaultOptions{ fieldLabelModifier =
+--- a/test/lhs-test.html
++++ b/test/lhs-test.html
+@@ -224,9 +224,6 @@
+ code span.vs { color: #4070a0; } /* VerbatimString */
+ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
+ </style>
+- <!--[if lt IE 9]>
+- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+- <![endif]-->
+ </head>
+ <body>
+ <h1 id="lhs-test">lhs test</h1>
+--- a/test/lhs-test.html+lhs
++++ b/test/lhs-test.html+lhs
+@@ -224,9 +224,6 @@
+ code span.vs { color: #4070a0; } /* VerbatimString */
+ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
+ </style>
+- <!--[if lt IE 9]>
+- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+- <![endif]-->
+ </head>
+ <body>
+ <h1 id="lhs-test">lhs test</h1>
+--- a/test/writer.html5
++++ b/test/writer.html5
+@@ -163,9 +163,6 @@
+ }
+ .display.math{display: block; text-align: center; margin: 0.5rem auto;}
+ </style>
+- <!--[if lt IE 9]>
+- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+- <![endif]-->
+ </head>
+ <body>
+ <header id="title-block-header">
+--- a/test/s5-fancy.html
++++ b/test/s5-fancy.html
+@@ -33,8 +33,7 @@
+ <link rel="stylesheet" href="s5/default/opera.css" type="text/css" media="projection" id="operaFix" />
+ <!-- S5 JS -->
+ <script src="s5/default/slides.js" type="text/javascript"></script>
+- <script
+- src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml-full.js"
++ <script src="/usr/share/javascript/mathjax/MathJax.js"
+ type="text/javascript"></script>
+ </head>
+ <body>
diff -Nru haskell-pandoc-3.0.1/debian/patches/2002_program_package_hint.patch haskell-pandoc-3.0.1/debian/patches/2002_program_package_hint.patch
--- haskell-pandoc-3.0.1/debian/patches/2002_program_package_hint.patch 1970-01-01 01:00:00.000000000 +0100
+++ haskell-pandoc-3.0.1/debian/patches/2002_program_package_hint.patch 2023-12-21 21:11:25.000000000 +0100
@@ -0,0 +1,18 @@
+Description: Improve error message when pdf program is missing
+Author: Chris Lamb <lamby at debian.org>
+Author: Jonas Smedegaard <dr at jones.dk>
+License: GPL-3+
+Last-Update: 2018-09-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Text/Pandoc/Error.hs
++++ b/src/Text/Pandoc/Error.hs
+@@ -85,7 +85,7 @@
+ PandocSyntaxMapError s -> s
+ PandocFailOnWarningError -> "Failing because there were warnings."
+ PandocPDFProgramNotFoundError pdfprog ->
+- pdfprog <> " not found. Please select a different --pdf-engine or install " <> pdfprog
++ pdfprog <> " not found. Please select a different --pdf-engine or install " <> pdfprog <> " -- see also /usr/share/doc/pandoc/README.Debian"
+ PandocPDFError logmsg -> "Error producing PDF.\n" <> logmsg
+ PandocXMLError fp logmsg -> "Invalid XML" <>
+ (if T.null fp then "" else " in " <> fp) <> ":\n" <> logmsg
diff -Nru haskell-pandoc-3.0.1/debian/patches/series haskell-pandoc-3.0.1/debian/patches/series
--- haskell-pandoc-3.0.1/debian/patches/series 2023-12-06 17:16:57.000000000 +0100
+++ haskell-pandoc-3.0.1/debian/patches/series 2023-12-21 21:10:37.000000000 +0100
@@ -9,3 +9,5 @@
020230623.4~5246f02.patch
020230720~eddedbf.patch
8b523749aebb67f709fe7348b412f3e5e629ceb4.patch
+2001_templates_avoid_privacy_breach.patch
+2002_program_package_hint.patch
More information about the Pkg-haskell-maintainers
mailing list