[Git][haskell-team/DHG_packages][master] pandoc: Upgrading from 3.0.1 to 3.1.3
Scott Talbert (@swt2c)
gitlab at salsa.debian.org
Wed Jan 3 17:35:30 GMT 2024
Scott Talbert pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
23f58ecb by Scott Talbert at 2024-01-02T23:24:29-05:00
pandoc: Upgrading from 3.0.1 to 3.1.3
- - - - -
10 changed files:
- p/haskell-pandoc/debian/changelog
- p/haskell-pandoc/debian/control
- p/haskell-pandoc/debian/patches/020230623.3~fe62da6.patch
- p/haskell-pandoc/debian/patches/2001_templates_avoid_privacy_breach.patch
- − p/haskell-pandoc/debian/patches/46a4e24d6b03ed88915541a57650f78ec06f6250.patch
- − p/haskell-pandoc/debian/patches/65346fa6b1ced5062cf059335b4e9b2db48c287c.patch
- p/haskell-pandoc/debian/patches/8b523749aebb67f709fe7348b412f3e5e629ceb4.patch
- p/haskell-pandoc/debian/patches/f9153e86bbb0b0b5a6722dded757b43c59f3e057.patch
- p/haskell-pandoc/debian/patches/series
- p/haskell-pandoc/debian/patches/undo-xml-light-internal-library
Changes:
=====================================
p/haskell-pandoc/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-pandoc (3.1.3-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #1057852)
+
+ -- Scott Talbert <swt at techie.net> Tue, 02 Jan 2024 22:56:34 -0500
+
haskell-pandoc (3.0.1-4) unstable; urgency=medium
[ Jonas Smedegaard ]
=====================================
p/haskell-pandoc/debian/control
=====================================
@@ -45,7 +45,7 @@ Build-Depends: debhelper (>= 10),
libghc-commonmark-dev (>= 0.2.2),
libghc-commonmark-dev (<< 0.3),
libghc-commonmark-prof,
- libghc-commonmark-extensions-dev (>= 0.2.3.3),
+ libghc-commonmark-extensions-dev (>= 0.2.3.4),
libghc-commonmark-extensions-dev (<< 0.3),
libghc-commonmark-extensions-prof,
libghc-commonmark-pandoc-dev (>= 0.2.1.3),
@@ -59,7 +59,7 @@ Build-Depends: debhelper (>= 10),
libghc-diff-dev (>= 0.2),
libghc-diff-dev (<< 0.5),
libghc-diff-prof,
- libghc-doclayout-dev (>= 0.4),
+ libghc-doclayout-dev (>= 0.4.0.1),
libghc-doclayout-dev (<< 0.5),
libghc-doclayout-prof,
libghc-doctemplates-dev (>= 0.11),
@@ -89,7 +89,7 @@ Build-Depends: debhelper (>= 10),
libghc-ipynb-dev (>= 0.2),
libghc-ipynb-dev (<< 0.3),
libghc-ipynb-prof,
- libghc-jira-wiki-markup-dev (>= 1.5),
+ libghc-jira-wiki-markup-dev (>= 1.5.1),
libghc-jira-wiki-markup-dev (<< 1.6),
libghc-jira-wiki-markup-prof,
libghc-mime-types-dev (>= 0.1.1),
@@ -115,10 +115,10 @@ Build-Depends: debhelper (>= 10),
libghc-scientific-dev (>= 0.3),
libghc-scientific-dev (<< 0.4),
libghc-scientific-prof,
- libghc-skylighting-dev (>= 0.13.2),
+ libghc-skylighting-dev (>= 0.13.2.1),
libghc-skylighting-dev (<< 0.14),
libghc-skylighting-prof,
- libghc-skylighting-core-dev (>= 0.13.2),
+ libghc-skylighting-core-dev (>= 0.13.2.1),
libghc-skylighting-core-dev (<< 0.14),
libghc-skylighting-core-prof,
libghc-split-dev (>= 0.2),
@@ -145,25 +145,31 @@ Build-Depends: debhelper (>= 10),
libghc-temporary-dev (>= 1.1),
libghc-temporary-dev (<< 1.4),
libghc-temporary-prof,
- libghc-texmath-dev (>= 0.12.6),
+ libghc-texmath-dev (>= 0.12.8),
libghc-texmath-dev (<< 0.13),
libghc-texmath-prof,
libghc-text-conversions-dev (>= 0.3),
libghc-text-conversions-dev (<< 0.4),
libghc-text-conversions-prof,
+ libghc-typst-dev (>= 0.1),
+ libghc-typst-dev (<< 0.2),
+ libghc-typst-prof,
libghc-unicode-collation-dev (>= 0.1.1),
libghc-unicode-collation-dev (<< 0.2),
libghc-unicode-collation-prof,
libghc-unicode-transforms-dev (>= 0.3),
libghc-unicode-transforms-dev (<< 0.5),
libghc-unicode-transforms-prof,
+ libghc-vector-dev (>= 0.12),
+ libghc-vector-dev (<< 0.14),
+ libghc-vector-prof,
libghc-xml-dev (>= 1.3.12),
libghc-xml-dev (<< 1.4),
libghc-xml-prof,
libghc-yaml-dev (>= 0.11),
libghc-yaml-dev (<< 0.12),
libghc-yaml-prof,
- libghc-zip-archive-dev (>= 0.2.3.4),
+ libghc-zip-archive-dev (>= 0.4.3),
libghc-zip-archive-dev (<< 0.5),
libghc-zip-archive-prof,
libghc-zlib-dev (>= 0.5),
@@ -218,8 +224,10 @@ Build-Depends-Indep: ghc-doc,
libghc-temporary-doc,
libghc-texmath-doc,
libghc-text-conversions-doc,
+ libghc-typst-doc,
libghc-unicode-collation-doc,
libghc-unicode-transforms-doc,
+ libghc-vector-doc,
libghc-xml-doc,
libghc-yaml-doc,
libghc-zip-archive-doc,
=====================================
p/haskell-pandoc/debian/patches/020230623.3~fe62da6.patch
=====================================
@@ -9,15 +9,15 @@ Last-Update: 2023-07-25
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pandoc.cabal
+++ b/pandoc.cabal
-@@ -751,6 +751,7 @@
+@@ -759,6 +759,7 @@ test-suite test-pandoc
tasty-hunit >= 0.9 && < 0.11,
tasty-quickcheck >= 0.8 && < 0.11,
text >= 1.1.1.0 && < 2.1,
+ temporary >= 1.1 && < 1.4,
time >= 1.5 && < 1.14,
xml >= 1.3.12 && < 1.4,
- zip-archive >= 0.2.3.4 && < 0.5
-@@ -758,6 +759,7 @@
+ zip-archive >= 0.4.3 && < 0.5
+@@ -766,6 +767,7 @@ test-suite test-pandoc
Tests.Command
Tests.Helpers
Tests.Shared
@@ -69,7 +69,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ ]
--- a/test/test-pandoc.hs
+++ b/test/test-pandoc.hs
-@@ -50,6 +50,7 @@
+@@ -50,6 +50,7 @@ import qualified Tests.Writers.RST
import qualified Tests.Writers.AnnotatedTable
import qualified Tests.Writers.TEI
import qualified Tests.Writers.Markua
@@ -77,7 +77,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
import Text.Pandoc.Shared (inDirectory)
tests :: FilePath -> TestTree
-@@ -57,6 +58,7 @@
+@@ -57,6 +58,7 @@ tests pandocPath = testGroup "pandoc tes
[ Tests.Command.tests
, testGroup "Old" (Tests.Old.tests pandocPath)
, testGroup "Shared" Tests.Shared.tests
=====================================
p/haskell-pandoc/debian/patches/2001_templates_avoid_privacy_breach.patch
=====================================
@@ -44,7 +44,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/data/templates/default.dzslides
+++ b/data/templates/default.dzslides
-@@ -20,15 +20,12 @@
+@@ -20,15 +20,12 @@ $for(css)$
<link rel="stylesheet" href="$css$">
$endfor$
$else$
@@ -63,8 +63,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/data/templates/default.html5
+++ b/data/templates/default.html5
-@@ -29,9 +29,6 @@
- $if(math)$
+@@ -32,9 +32,6 @@ $if(mathjax)$
+ $endif$
$math$
$endif$
- <!--[if lt IE 9]>
@@ -75,7 +75,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
$for(include-before)$
--- a/src/Text/Pandoc/Options.hs
+++ b/src/Text/Pandoc/Options.hs
-@@ -370,10 +370,10 @@
+@@ -373,10 +373,10 @@ isEnabled :: HasSyntaxExtensions a => Ex
isEnabled ext opts = ext `extensionEnabled` getExtensions opts
defaultMathJaxURL :: Text
@@ -90,7 +90,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
$(deriveJSON defaultOptions{ fieldLabelModifier =
--- a/test/lhs-test.html
+++ b/test/lhs-test.html
-@@ -224,9 +224,6 @@
+@@ -227,9 +227,6 @@
code span.vs { color: #4070a0; } /* VerbatimString */
code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
</style>
@@ -102,7 +102,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<h1 id="lhs-test">lhs test</h1>
--- a/test/lhs-test.html+lhs
+++ b/test/lhs-test.html+lhs
-@@ -224,9 +224,6 @@
+@@ -227,9 +227,6 @@
code span.vs { color: #4070a0; } /* VerbatimString */
code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
</style>
@@ -114,7 +114,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<h1 id="lhs-test">lhs test</h1>
--- a/test/writer.html5
+++ b/test/writer.html5
-@@ -163,9 +163,6 @@
+@@ -166,9 +166,6 @@
}
.display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
@@ -126,7 +126,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<header id="title-block-header">
--- a/test/s5-fancy.html
+++ b/test/s5-fancy.html
-@@ -33,8 +33,7 @@
+@@ -36,8 +36,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>
=====================================
p/haskell-pandoc/debian/patches/46a4e24d6b03ed88915541a57650f78ec06f6250.patch deleted
=====================================
@@ -1,45 +0,0 @@
-From 46a4e24d6b03ed88915541a57650f78ec06f6250 Mon Sep 17 00:00:00 2001
-From: John MacFarlane <jgm at berkeley.edu>
-Date: Tue, 30 May 2023 10:28:19 -0700
-Subject: [PATCH] Add typst reader.
-
-New module Text.Pandoc.Readers.Typst [API change].
----
- MANUAL.txt | 1 +
- cabal.project | 4 +-
- pandoc.cabal | 9 +-
- shell.nix | 1 -
- src/Text/Pandoc/Format.hs | 1 +
- src/Text/Pandoc/Readers.hs | 3 +
- src/Text/Pandoc/Readers/Typst.hs | 520 +++++++++++++++++++++++
- src/Text/Pandoc/Readers/Typst/Math.hs | 376 ++++++++++++++++
- src/Text/Pandoc/Readers/Typst/Parsing.hs | 61 +++
- src/Text/Pandoc/Writers/Typst.hs | 5 -
- stack.yaml | 6 +-
- test/command/6288.md | 4 +-
- test/epub/features.native | 4 +-
- 13 files changed, 978 insertions(+), 17 deletions(-)
- create mode 100644 src/Text/Pandoc/Readers/Typst.hs
- create mode 100644 src/Text/Pandoc/Readers/Typst/Math.hs
- create mode 100644 src/Text/Pandoc/Readers/Typst/Parsing.hs
-
---- a/test/epub/features.native
-+++ b/test/epub/features.native
-@@ -1281,7 +1281,7 @@
- , Plain
- [ Math
- DisplayMath
-- "\\begin{matrix}\n & {\\operatorname{cov}(\\mathcal{L})} & \\longrightarrow & {\\operatorname{non}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{cof}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{cof}(\\mathcal{L})} & \\longrightarrow & 2^{\\aleph_{0}} \\\\\n & \\uparrow & & \\uparrow & & \\uparrow & & \\uparrow & & \\\\\n & {\\mathfrak{b}} & \\longrightarrow & {\\mathfrak{d}} & & & & & & \\\\\n & \\uparrow & & \\uparrow & & & & & & \\\\\n\\aleph_{1} & \\longrightarrow & {\\operatorname{add}(\\mathcal{L})} & \\longrightarrow & {\\operatorname{add}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{cov}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{non}(\\mathcal{L})} & \\\\\n\\end{matrix}"
-+ "\\begin{matrix}\n & {\\operatorname{cov}(\\mathcal{L})} & \\longrightarrow & {\\operatorname{non}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{cof}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{cof}(\\mathcal{L})} & \\longrightarrow & 2^{\\aleph_{0}} \\\\\n & \\uparrow & & \\uparrow & & \\uparrow & & \\uparrow & & \\\\\n & {\\mathfrak{b}} & \\longrightarrow & {\\mathfrak{d}} & & & & & & \\\\\n & \\uparrow & & \\uparrow & & & & & & \\\\\n\\aleph_{1} & \\longrightarrow & {\\operatorname{add}(\\mathcal{L})} & \\longrightarrow & {\\operatorname{add}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{cov}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{non}(\\mathcal{L})} & \n\\end{matrix}"
- ]
- , Para
- [ Str "The"
-@@ -1352,7 +1352,7 @@
- , Plain
- [ Math
- DisplayMath
-- "{\1583(\1587)} = \\left\\{ \\begin{matrix}\n{\\sum\\limits_{\1646 = 1}^{\1589}\1587^{\1646}} & {\\text{\1573\1584\1575\1603\1575\1606}\1587 > 0} \\\\\n{\\int_{1}^{\1589}{\1587^{\1646}\1569\1587}} & {\\text{\1573\1584\1575\1603\1575\1606}\1587 \\in \1605} \\\\\n{{\1591\1575}\\pi} & {\\text{\1594\1610\1585\1584\1604\1603}\\left( \\text{\1605\1593}\\pi \\simeq 3,141 \\right)} \\\\\n\\end{matrix} \\right."
-+ "{\1583(\1587)} = \\left\\{ \\begin{matrix}\n{\\sum\\limits_{\1646 = 1}^{\1589}\1587^{\1646}} & {\\text{\1573\1584\1575\1603\1575\1606}\1587 > 0} \\\\\n{\\int_{1}^{\1589}{\1587^{\1646}\1569\1587}} & {\\text{\1573\1584\1575\1603\1575\1606}\1587 \\in \1605} \\\\\n{{\1591\1575}\\pi} & {\\text{\1594\1610\1585\1584\1604\1603}\\left( \\text{\1605\1593}\\pi \\simeq 3,141 \\right)}\n\\end{matrix} \\right."
- ]
- , Para
- [ Str "The"
=====================================
p/haskell-pandoc/debian/patches/65346fa6b1ced5062cf059335b4e9b2db48c287c.patch deleted
=====================================
@@ -1,22 +0,0 @@
-From 65346fa6b1ced5062cf059335b4e9b2db48c287c Mon Sep 17 00:00:00 2001
-From: John MacFarlane <jgm at berkeley.edu>
-Date: Sat, 6 May 2023 11:03:43 -0700
-Subject: [PATCH] Use latest texmath
-
----
- cabal.project | 2 +-
- stack.yaml | 2 +-
- test/epub/features.native | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/test/epub/features.native
-+++ b/test/epub/features.native
-@@ -1184,7 +1184,7 @@
- , Plain
- [ Math
- DisplayMath
-- "c = \\overset{\\text{complex\\ number}}{\\overbrace{\\underset{\\text{real}}{\\underbrace{\\mspace{20mu} a\\mspace{20mu}}} + \\underset{\\text{imaginary}}{\\underbrace{\\quad b{\\mathbb{i}}\\quad}}}}"
-+ "c = \\overset{\\text{complex number}}{\\overbrace{\\underset{\\text{real}}{\\underbrace{\\mspace{20mu} a\\mspace{20mu}}} + \\underset{\\text{imaginary}}{\\underbrace{\\quad b{\\mathbb{i}}\\quad}}}}"
- ]
- , Para
- [ Str "The"
=====================================
p/haskell-pandoc/debian/patches/8b523749aebb67f709fe7348b412f3e5e629ceb4.patch
=====================================
@@ -19,7 +19,7 @@ Index: b/pandoc.cabal
===================================================================
--- a/pandoc.cabal
+++ b/pandoc.cabal
-@@ -451,6 +451,7 @@ library
+@@ -454,6 +454,7 @@ library
aeson-pretty >= 0.8.9 && < 0.9,
array >= 0.5 && < 0.6,
attoparsec >= 0.12 && < 0.15,
@@ -27,9 +27,9 @@ Index: b/pandoc.cabal
binary >= 0.7 && < 0.11,
blaze-html >= 0.9 && < 0.10,
blaze-markup >= 0.8 && < 0.9,
-@@ -467,7 +468,6 @@ library
+@@ -470,7 +471,6 @@ library
directory >= 1.2.3 && < 1.4,
- doclayout >= 0.4 && < 0.5,
+ doclayout >= 0.4.0.1 && < 0.5,
doctemplates >= 0.11 && < 0.12,
- base64 >= 0.4 && < 0.5,
emojis >= 0.1 && < 0.2,
@@ -92,7 +92,7 @@ Index: b/src/Text/Pandoc/Readers/HTML.hs
import Data.Char (isAlphaNum, isLetter)
import Data.Default (Default (..), def)
import Data.Foldable (for_)
-@@ -779,7 +779,8 @@ pSvg = do
+@@ -786,7 +786,8 @@ pSvg = do
contents <- many (notFollowedBy (pCloses "svg") >> pAny)
closet <- TagClose "svg" <$ (pCloses "svg" <|> eof)
let rawText = T.strip $ renderTags' (opent : contents ++ [closet])
=====================================
p/haskell-pandoc/debian/patches/f9153e86bbb0b0b5a6722dded757b43c59f3e057.patch
=====================================
@@ -10,7 +10,7 @@ Subject: [PATCH] Update tests for skylighting-format-blaze-html change.
--- a/test/lhs-test.html
+++ b/test/lhs-test.html
-@@ -161,7 +161,7 @@
+@@ -164,7 +164,7 @@
.display.math{display: block; text-align: center; margin: 0.5rem auto;}
/* CSS for syntax highlighting */
pre > code.sourceCode { white-space: pre; position: relative; }
@@ -21,7 +21,7 @@ Subject: [PATCH] Update tests for skylighting-format-blaze-html change.
code.sourceCode > span { color: inherit; text-decoration: inherit; }
--- a/test/lhs-test.html+lhs
+++ b/test/lhs-test.html+lhs
-@@ -161,7 +161,7 @@
+@@ -164,7 +164,7 @@
.display.math{display: block; text-align: center; margin: 0.5rem auto;}
/* CSS for syntax highlighting */
pre > code.sourceCode { white-space: pre; position: relative; }
=====================================
p/haskell-pandoc/debian/patches/series
=====================================
@@ -1,6 +1,4 @@
f9153e86bbb0b0b5a6722dded757b43c59f3e057.patch
-65346fa6b1ced5062cf059335b4e9b2db48c287c.patch
-46a4e24d6b03ed88915541a57650f78ec06f6250.patch
undo-xml-light-internal-library
020230620~5e381e3.patch
020230623.1~54561e9.patch
=====================================
p/haskell-pandoc/debian/patches/undo-xml-light-internal-library
=====================================
@@ -1,6 +1,6 @@
--- a/pandoc.cabal
+++ b/pandoc.cabal
-@@ -442,24 +442,9 @@
+@@ -445,24 +445,9 @@ common common-executable
build-depends: pandoc
ghc-options: -rtsopts -with-rtsopts=-A8m -threaded
@@ -26,18 +26,16 @@
JuicyPixels >= 3.1.6.1 && < 3.4,
SHA >= 1.6 && < 1.7,
aeson >= 2.0.1.0 && < 2.2,
-@@ -521,7 +506,9 @@
- yaml >= 0.11 && < 0.12,
- zip-archive >= 0.2.3.4 && < 0.5,
+@@ -525,6 +510,8 @@ library
+ zip-archive >= 0.4.3 && < 0.5,
zlib >= 0.5 && < 0.7,
-- xml >= 1.3.12 && < 1.4
-+ xml >= 1.3.12 && < 1.4,
+ xml >= 1.3.12 && < 1.4,
+ xml-conduit >= 1.9.1.1 && < 1.10,
+ xml-types >= 0.3 && < 0.4,
+ typst >= 0.1 && < 0.2,
+ vector >= 0.12 && < 0.14
- if !os(windows)
- build-depends: unix >= 2.4 && < 2.9
-@@ -529,6 +516,7 @@
+@@ -534,6 +521,7 @@ library
cpp-options: -DEMBED_DATA_FILES
other-modules: Text.Pandoc.Data.BakedIn
hs-source-dirs: src
@@ -45,7 +43,7 @@
exposed-modules: Text.Pandoc,
Text.Pandoc.App,
-@@ -624,6 +612,10 @@
+@@ -631,6 +619,10 @@ library
Text.Pandoc.Slides,
Text.Pandoc.Templates,
Text.Pandoc.XML,
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/23f58ecb04084dabbf39ab5f70fd9e47fc64bd41
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/23f58ecb04084dabbf39ab5f70fd9e47fc64bd41
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20240103/ebbfb52e/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list