[Git][haskell-team/DHG_packages][master] carettah: Upgrading from 0.4.2 to 0.5.1

[Ilias Tsitsimpis]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
34c6fdc3 by Ilias Tsitsimpis at 2018-06-27T19:23:51+03:00
carettah: Upgrading from 0.4.2 to 0.5.1

- - - - -


5 changed files:

- p/carettah/debian/changelog
- p/carettah/debian/control
- + p/carettah/debian/patches/newer-pandoc
- − p/carettah/debian/patches/newer-pandoc-types
- p/carettah/debian/patches/series


Changes:

=====================================
p/carettah/debian/changelog
=====================================
--- a/p/carettah/debian/changelog
+++ b/p/carettah/debian/changelog
@@ -1,8 +1,13 @@
-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 at debian.org>  Sun, 06 May 2018 22:09:09 -0400
+  [ Ilias Tsitsimpis ]
+  * New upstream release
+  * Patch for newer pandoc (Closes: #897517)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 27 Jun 2018 17:41:57 +0300
 
 carettah (0.4.2-5) unstable; urgency=medium
 


=====================================
p/carettah/debian/control
=====================================
--- a/p/carettah/debian/control
+++ b/p/carettah/debian/control
@@ -7,26 +7,30 @@ Uploaders:
  Louis Bettens <louis at 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


=====================================
p/carettah/debian/patches/newer-pandoc
=====================================
--- /dev/null
+++ b/p/carettah/debian/patches/newer-pandoc
@@ -0,0 +1,30 @@
+Description: Patch for newer pandoc
+Author: Ilias Tsitsimpis <iliastsi at 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,


=====================================
p/carettah/debian/patches/newer-pandoc-types deleted
=====================================
--- a/p/carettah/debian/patches/newer-pandoc-types
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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


=====================================
p/carettah/debian/patches/series
=====================================
--- a/p/carettah/debian/patches/series
+++ b/p/carettah/debian/patches/series
@@ -1 +1 @@
-newer-pandoc-types
+newer-pandoc



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/34c6fdc3e06403f5f39262f9424b2ae264ecfc05

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/34c6fdc3e06403f5f39262f9424b2ae264ecfc05
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/20180627/605057b8/attachment-0001.html>