[DHG_packages] 03/03: carettah: Upgrading from 0.3.0 to 0.4.2

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository DHG_packages.

commit 2ad1746e7a0b94ea6e889797f7c7fbb16d2859ac
Author: Clint Adams <clint at debian.org>
Date:   Fri Sep 30 11:30:36 2016 -0400

    carettah: Upgrading from 0.3.0 to 0.4.2
---
 p/carettah/debian/changelog                  | 12 +++++++----
 p/carettah/debian/control                    | 16 +++++++-------
 p/carettah/debian/patches/newer-pandoc-types | 32 ++++++++++++++++++++++++++++
 p/carettah/debian/patches/series             |  1 +
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/p/carettah/debian/changelog b/p/carettah/debian/changelog
index 0dfe83c..be80059 100644
--- a/p/carettah/debian/changelog
+++ b/p/carettah/debian/changelog
@@ -1,14 +1,18 @@
-carettah (0.3.0-1) unstable; urgency=medium
+carettah (0.4.2-1) unstable; urgency=medium
 
   * New upstream version.
 
- -- Kiwamu Okabe <kiwamu at debian.or.jp>  Wed, 28 May 2014 23:27:17 +0900
+ -- Clint Adams <clint at debian.org>  Fri, 30 Sep 2016 11:30:36 -0400
 
-carettah (0.2.0-3) UNRELEASED; urgency=low
+carettah (0.3.0-1) unstable; urgency=medium
 
+  [ Joachim Breitner ]
   * Adjust watch file to new hackage layout
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 05 Oct 2013 18:19:26 +0200
+  [ Kiwamu Okabe ]
+  * New upstream version.
+
+ -- Kiwamu Okabe <kiwamu at debian.or.jp>  Wed, 28 May 2014 23:27:17 +0900
 
 carettah (0.2.0-2) unstable; urgency=low
 
diff --git a/p/carettah/debian/control b/p/carettah/debian/control
index 442dce6..f0e894d 100644
--- a/p/carettah/debian/control
+++ b/p/carettah/debian/control
@@ -24,18 +24,18 @@ Build-Depends: debhelper (>= 9),
                libghc-highlighting-kate-dev,
                libghc-highlighting-kate-prof,
                libcwiid-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 Homepage: http://carettah.masterq.net/
-Vcs-Darcs: http://darcs.debian.org/pkg-haskell/carettah
-Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/carettah
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/carettah
+Vcs-Git: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git
 
 Package: carettah
 Architecture: any
 Section: misc
-Depends: ${shlibs:Depends}, ${haskell:Depends}, ${misc:Depends}, fonts-ipafont
-Description: Presentation tool written with Haskell.
- A presentation tool written with Haskell.
- Carettah make a new presentation with command 'carettah -n markdown.md'.
- And it's controled by keyboard or Wii Remote.
+Depends: ${shlibs:Depends}, ${haskell:Depends}, ${misc:Depends}, fonts-noto-cjk
+Description: presentation tool that renders Markdown
+ A presentation tool written with Haskell, Carettah displays a new
+ presentation when invoked like `carettah -n markdown.md`.  It can
+ be controlled by keyboard or Wiimote.
  .
  It's a clone of Rabbit <http://rabbit-shockers.org/>.
diff --git a/p/carettah/debian/patches/newer-pandoc-types b/p/carettah/debian/patches/newer-pandoc-types
new file mode 100644
index 0000000..c0d3707
--- /dev/null
+++ b/p/carettah/debian/patches/newer-pandoc-types
@@ -0,0 +1,32 @@
+--- 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
diff --git a/p/carettah/debian/patches/series b/p/carettah/debian/patches/series
new file mode 100644
index 0000000..14f5058
--- /dev/null
+++ b/p/carettah/debian/patches/series
@@ -0,0 +1 @@
+newer-pandoc-types

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git