carettah: Upgrading from 0.4.2 to 0.5.1

carettah (0.4.2-6) UNRELEASED; urgency=medium

carettah (0.5.1-1) unstable; urgency=medium

  [ Clint Adams ]

  * Set Rules-Requires-Root to no.

 -- Clint Adams <clint@debian.org>  Sun, 06 May 2018 22:09:09 -0400

  [ Ilias Tsitsimpis ]

  * New upstream release

  * Patch for newer pandoc (Closes: #897517)

 -- Ilias Tsitsimpis <iliastsi@debian.org>  Wed, 27 Jun 2018 17:41:57 +0300

carettah (0.4.2-5) unstable; urgency=medium

 Louis Bettens <louis@bettens.info>,

Rules-Requires-Root: no

Build-Depends:

 cdbs,

 debhelper (>= 9),

 ghc (>= 8),

 haskell-devscripts (>= 0.9),

 cdbs,

 ghc,

 ghc-prof,

 haskell-devscripts (>= 0.8.19),

 libcwiid-dev,

 libghc-cairo-dev,

 libghc-cairo-prof,

 libghc-gtk-dev,

 libghc-gtk-dev (>= 0.13),

 libghc-gtk-prof,

 libghc-gtk2hs-buildtools-dev,

 libghc-gtk2hs-buildtools-prof,

 libghc-hcwiid-dev,

 libghc-hcwiid-prof,

 libghc-highlighting-kate-dev,

 libghc-highlighting-kate-prof,

 libghc-mtl-dev,

 libghc-mtl-prof,

 libghc-pandoc-dev,

 libghc-pandoc-dev (>= 2.2.1),

 libghc-pandoc-prof,

 libghc-pango-dev,

 libghc-pango-prof,

 libghc-text-dev,

 libghc-text-prof,

Standards-Version: 4.1.4

Homepage: https://github.com/master-q/carettah

Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/carettah

Description: Patch for newer pandoc

Author: Ilias Tsitsimpis <iliastsi@debian.org>

Bug-Debian: https://bugs.debian.org/897517

Index: b/Carettah.hs

===================================================================

--- a/Carettah.hs

+++ b/Carettah.hs

@@ -23,7 +23,7 @@ import WrapPaths

 markdown :: String -> P.Pandoc

 markdown s = r

-  where Right r = P.readMarkdown P.def{ P.readerStandalone = True } $ s

+  where Right r = P.runPure $ P.readMarkdown P.def{ P.readerStandalone = True } $ T.pack s

 splitBlocks :: P.Pandoc -> [[P.Block]]

 splitBlocks (P.Pandoc _ blocks) = go blocks

Index: b/carettah.cabal

===================================================================

--- a/carettah.cabal

+++ b/carettah.cabal

@@ -25,7 +25,7 @@ Executable              _carettah_main_

                         time,

                         mtl,

                         directory,

-                        pandoc >= 1.14,

+                        pandoc >= 2.2.1,

                         gtk >= 0.13,

                         cairo,

                         pango,

--- a/Carettah.hs

+++ b/Carettah.hs

@@ -36,7 +36,7 @@

 backgroundTop :: [P.Block] -> [P.Block]

 backgroundTop blocks = filter go blocks ++ filter (not . go) blocks

-  where go (P.Para [P.Image [P.Str "background"] _]) = True

+  where go (P.Para [P.Image _ [P.Str "background"] _]) = True

         go _ = False

 inlinesToString :: [P.Inline] -> String

@@ -57,9 +57,9 @@

     tcbs = textCodeBlockSize gCfg

     tcbo = textCodeBlockOfs gCfg

     go :: P.Block -> Double -> C.Render Double

-    go (P.Para [P.Image [P.Str "background"] (pngfile, _)]) =

+    go (P.Para [P.Image _ [P.Str "background"] (pngfile, _)]) =

       \y -> renderPngFit ag pngfile >> return y

-    go (P.Para [P.Image [P.Str "inline"] (pngfile, _)]) =

+    go (P.Para [P.Image _ [P.Str "inline"] (pngfile, _)]) =

       \y -> renderPngInline (CCenter, CPosition y) (CFit, CFit) 

             1 pngfile

     go (P.Header 1 _ strs) =

@@ -85,7 +85,7 @@

     tccy = textContextCoverY gCfg

     tccs = textContextCoverSize gCfg

     go :: P.Block -> Double -> C.Render Double

-    go (P.Para [P.Image [P.Str "background"] (pngfile, _)]) =

+    go (P.Para [P.Image _ [P.Str "background"] (pngfile, _)]) =

       \y -> renderPngFit ag pngfile >> return y

     go (P.Header 1 _ strs) =

       \y -> renderLayoutM (CCenter, CPosition ttcy) ttcs (inlinesToString strs) >> return y

newer-pandoc-types

newer-pandoc