[Git][haskell-team/DHG_packages][master] pandoc-server: Upgrading from 0.1.0.2 to 0.1.0.5
Scott Talbert (@swt2c)
gitlab at salsa.debian.org
Tue Oct 15 14:50:19 BST 2024
Scott Talbert pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
6c46423c by Scott Talbert at 2024-10-14T12:51:12-04:00
pandoc-server: Upgrading from 0.1.0.2 to 0.1.0.5
- - - - -
4 changed files:
- p/haskell-pandoc-server/debian/changelog
- p/haskell-pandoc-server/debian/control
- − p/haskell-pandoc-server/debian/patches/replace-base64
- − p/haskell-pandoc-server/debian/patches/series
Changes:
=====================================
p/haskell-pandoc-server/debian/changelog
=====================================
@@ -1,8 +1,12 @@
-haskell-pandoc-server (0.1.0.2-4) UNRELEASED; urgency=medium
+haskell-pandoc-server (0.1.0.5-1) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.7.0
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 11 Sep 2024 15:18:01 +0300
+ [ Scott Talbert ]
+ * New upstream release
+
+ -- Scott Talbert <swt at techie.net> Mon, 14 Oct 2024 12:49:13 -0400
haskell-pandoc-server (0.1.0.2-3) unstable; urgency=medium
=====================================
p/haskell-pandoc-server/debian/control
=====================================
@@ -7,7 +7,7 @@ Rules-Requires-Root: no
Build-Depends: debhelper (>= 10),
haskell-devscripts (>= 0.13),
cdbs,
- ghc (>= 9.4),
+ ghc (>= 9.6),
ghc-prof,
libghc-aeson-dev (>= 2.0),
libghc-aeson-dev (<< 2.3),
@@ -30,7 +30,7 @@ Build-Depends: debhelper (>= 10),
libghc-servant-server-dev (<< 0.21),
libghc-servant-server-prof,
libghc-skylighting-dev (>= 0.13),
- libghc-skylighting-dev (<< 0.14),
+ libghc-skylighting-dev (<< 0.15),
libghc-skylighting-prof,
libghc-unicode-collation-dev (>= 0.1.1),
libghc-unicode-collation-dev (<< 0.2),
=====================================
p/haskell-pandoc-server/debian/patches/replace-base64 deleted
=====================================
@@ -1,90 +0,0 @@
-From e7348b4f769eb79973cdf52b11ec2a89bbca4a7f Mon Sep 17 00:00:00 2001
-From: John MacFarlane <jgm at berkeley.edu>
-Date: Wed, 6 Dec 2023 09:11:07 -0800
-Subject: [PATCH] pandoc-server: Switch from base64 to base64-bytestring.
-
-See #9233.
----
- pandoc-server/pandoc-server.cabal | 2 +-
- pandoc-server/src/Text/Pandoc/Server.hs | 25 ++++++++++---------------
- 2 files changed, 11 insertions(+), 16 deletions(-)
-
-Index: b/pandoc-server.cabal
-===================================================================
---- a/pandoc-server.cabal
-+++ b/pandoc-server.cabal
-@@ -54,7 +54,7 @@ library
- containers >= 0.6.0.1 && < 0.7,
- aeson >= 2.0 && < 2.3,
- bytestring >= 0.9 && < 0.13,
-- base64 >= 0.4 && < 0.5,
-+ base64-bytestring >= 0.1 && < 1.3,
- doctemplates >= 0.11 && < 0.12,
- data-default >= 0.4 && < 0.8,
- text >= 1.1.1.0 && < 2.1,
-Index: b/src/Text/Pandoc/Server.hs
-===================================================================
---- a/src/Text/Pandoc/Server.hs
-+++ b/src/Text/Pandoc/Server.hs
-@@ -29,7 +29,7 @@ import qualified Data.Text.Lazy.Encoding
- import Data.Maybe (fromMaybe)
- import qualified Data.ByteString as BS
- import qualified Data.ByteString.Lazy as BL
--import Data.ByteString.Base64 (decodeBase64, encodeBase64)
-+import qualified Data.ByteString.Base64 as Base64 (decodeLenient, encode)
- import Data.Default
- import Control.Monad (when, unless, foldM)
- import qualified Data.Set as Set
-@@ -111,15 +111,11 @@ newtype Blob = Blob BL.ByteString
- deriving (Show, Eq)
-
- instance ToJSON Blob where
-- toJSON (Blob bs) = toJSON (encodeBase64 $ BL.toStrict bs)
-+ toJSON (Blob bs) = toJSON (UTF8.toText . Base64.encode $ BL.toStrict bs)
-
- instance FromJSON Blob where
-- parseJSON = withText "Blob" $ \t -> do
-- let inp = UTF8.fromText t
-- case decodeBase64 inp of
-- Right bs -> return $ Blob $ BL.fromStrict bs
-- Left _ -> -- treat as regular text
-- return $ Blob $ BL.fromStrict inp
-+ parseJSON = withText "Blob" $
-+ pure . Blob . BL.fromStrict . Base64.decodeLenient . UTF8.fromText
-
- -- This is the data to be supplied by the JSON payload
- -- of requests. Maybe values may be omitted and will be
-@@ -236,7 +232,8 @@ server = convertBytes
- -- handleErr =<< liftIO (runIO (convert' params))
- -- will allow the IO operations.
- convertText params = handleErr $
-- runPure (convert' return (return . encodeBase64 . BL.toStrict) params)
-+ runPure (convert' return (return . UTF8.toText .
-+ Base64.encode . BL.toStrict) params)
-
- convertBytes params = handleErr $
- runPure (convert' (return . UTF8.fromText) (return . BL.toStrict) params)
-@@ -245,7 +242,7 @@ server = convertBytes
- runPure
- (convert'
- (\t -> Succeeded t False . map toMessage <$> getLog)
-- (\bs -> Succeeded (encodeBase64 (BL.toStrict bs)) True
-+ (\bs -> Succeeded (UTF8.toText $ Base64.encode (BL.toStrict bs)) True
- . map toMessage <$> getLog)
- params)
-
-@@ -341,11 +338,9 @@ server = convertBytes
-
- let reader = case readerSpec of
- TextReader r -> r readeropts
-- ByteStringReader r -> \t -> do
-- let eitherbs = decodeBase64 $ UTF8.fromText t
-- case eitherbs of
-- Left errt -> throwError $ PandocSomeError errt
-- Right bs -> r readeropts $ BL.fromStrict bs
-+ ByteStringReader r ->
-+ r readeropts . BL.fromStrict . Base64.decodeLenient
-+ . UTF8.fromText
-
- let writer d@(Pandoc meta _) = do
- case lookupMetaString "lang" meta of
=====================================
p/haskell-pandoc-server/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-replace-base64
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/6c46423c7be2e9aa48ee177b30d0542ea7395c44
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/6c46423c7be2e9aa48ee177b30d0542ea7395c44
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/20241015/1f8a8bda/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list