[DRE-commits] [rabbit] 05/11: applied upstream
Daisuke Higuchi
dai at moszumanska.debian.org
Sun Aug 6 03:59:08 UTC 2017
This is an automated email from the git hooks/post-receive script.
dai pushed a commit to branch master
in repository rabbit.
commit ac75371b375df3fdfc901cf3b1049fa2becf6c4b
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date: Sun Aug 6 12:08:33 2017 +0900
applied upstream
---
.../0004-Add-debian-theme-Closes-828214.patch | 261 ---------------------
debian/patches/series | 1 -
2 files changed, 262 deletions(-)
diff --git a/debian/patches/0004-Add-debian-theme-Closes-828214.patch b/debian/patches/0004-Add-debian-theme-Closes-828214.patch
deleted file mode 100644
index ce714fa..0000000
--- a/debian/patches/0004-Add-debian-theme-Closes-828214.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Sun, 26 Jun 2016 16:45:03 +0900
-Subject: Add debian theme (Closes: #828214)
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- lib/rabbit/theme/debian/debian.rb | 232 ++++++++++++++++++++++++++++++++++++
- lib/rabbit/theme/debian/property.rb | 3 +
- 2 files changed, 235 insertions(+)
- create mode 100644 lib/rabbit/theme/debian/debian.rb
- create mode 100644 lib/rabbit/theme/debian/property.rb
-
-diff --git a/lib/rabbit/theme/debian/debian.rb b/lib/rabbit/theme/debian/debian.rb
-new file mode 100644
-index 0000000..13a45a6
---- /dev/null
-+++ b/lib/rabbit/theme/debian/debian.rb
-@@ -0,0 +1,232 @@
-+# -*- coding: utf-8 -*-
-+#--------------------------------------
-+# font size setup
-+#--------------------------------------
-+ at xxxx_large_font_size = screen_size(10 * Pango::SCALE)
-+ at xxx_large_font_size = screen_size(8 * Pango::SCALE)
-+ at xx_large_font_size = screen_size(6 * Pango::SCALE)
-+ at x_large_font_size = screen_size(5 * Pango::SCALE)
-+ at large_font_size = screen_size(4.5 * Pango::SCALE)
-+ at normal_font_size = screen_size(3.5 * Pango::SCALE)
-+ at small_font_size = screen_size(3.2 * Pango::SCALE)
-+ at x_small_font_size = screen_size(3 * Pango::SCALE)
-+ at xx_small_font_size = screen_size(2.8 * Pango::SCALE)
-+ at xxx_small_font_size = screen_size(2.5 * Pango::SCALE)
-+ at script_font_size = @xxx_small_font_size
-+ at large_script_font_size = @xx_small_font_size
-+ at x_large_script_font_size = @xsmall_font_size
-+#--------------------------------------
-+ at title_slide_title_font_size = @xxx_large_font_size
-+#--------------------------------------
-+# font family setup
-+#--------------------------------------
-+ at default_font ||= "Sans"
-+ at font_family = find_font_family(@default_font)
-+ at bold_font ||= "Sans"
-+ at bold_font_family = find_font_family(@bold_font)
-+ at monospace_font ||= "Monospace"
-+ at monospace_font_family = find_font_family(@monospace_font)
-+#--------------------------------------
-+# add image path
-+#--------------------------------------
-+add_image_path("debian-images")
-+add_image_path("ruby-images")
-+add_image_path("rabbit-images")
-+#--------------------------------------
-+# set preformatted text area
-+#--------------------------------------
-+ at preformatted_frame_color = "#242424"
-+ at preformatted_frame_width = 0.5
-+ at preformatted_fill_color = "#fff"
-+ at preformatted_shadow_color = "#242424"
-+ at centering_preformatted_block = true
-+#--------------------------------------
-+# set blockqoute texts area
-+#--------------------------------------
-+ at block_quote_frame_width = 1
-+ at block_quote_title_font_size = @x_small_font_size * 0.8
-+ at block_quote_padding_left = screen_x(2)
-+ at block_quote_padding_right = screen_x(2)
-+#--------------------------------------
-+# set color of description term underline
-+#--------------------------------------
-+ at description_term_line_color ||= "#ff9900"
-+#--------------------------------------
-+# set image caption size
-+#--------------------------------------
-+# @image_frame_width = 0.0
-+ at image_caption_font_size = @xx_small_font_size * 0.8
-+#----------------------------------------
-+# set slide number at top-right
-+#----------------------------------------
-+ at slide_number_props = {
-+ "size" => @xx_small_font_size * 0.8,
-+ "font_family" => @bold_font
-+}
-+ at slide_number_position = :top
-+ at slide_number_color = "#fff"
-+#--------------------------------------
-+# use default theme
-+#--------------------------------------
-+include_theme("default")
-+include_theme("title-shadow")
-+include_theme("image-timer")
-+#----------------------------------------
-+# change reference text style
-+#----------------------------------------
-+match("**", ReferText) do |texts|
-+ texts.prop_set("underline", "none")
-+ texts.prop_set("foreground", "blue")
-+end
-+#----------------------------------------
-+# change blockqoute text style
-+#----------------------------------------
-+block_quote = [Slide, Body, BlockQuote]
-+item_list_item = [ItemList, ItemListItem]
-+
-+match(*(block_quote + (item_list_item * 1))) do |items|
-+ name = "block-quote-item1"
-+
-+ items.delete_pre_draw_proc_by_name(name)
-+ items.delete_post_draw_proc_by_name(name)
-+
-+ draw_image_mark(items, "item1.png", name)
-+end
-+#----------------------------------------
-+# item mark setup
-+#----------------------------------------
-+# item setup need update!!
-+slide_body = [Slide, Body]
-+item_list_item = [ItemList, ItemListItem]
-+match(*(slide_body + (item_list_item * 1))) do |items|
-+ name = "item1"
-+ items.delete_pre_draw_proc_by_name(name)
-+ items.delete_post_draw_proc_by_name(name)
-+ draw_image_mark(items, "item1.png", name)
-+end
-+#--------------------------------------
-+# set title background-image
-+#--------------------------------------
-+ at title_background_image = "debian-logo-pink.png"
-+include_theme("title-background-image")
-+#--------------------------------------
-+# override title slide font props
-+#--------------------------------------
-+match(TitleSlide) do |contents|
-+ contents.prop_set("style", "normal")
-+end
-+match(TitleSlide, ContentSource) do |sources|
-+ sources.margin_bottom = 0
-+end
-+match(TitleSlide, Date) do |dates|
-+ dates.margin_top = @space
-+end
-+match(TitleSlide, Place) do |places|
-+end
-+#--------------------------------------
-+# set debian logo in title slide
-+#--------------------------------------
-+ at title_logo = "debian-whirl.png"
-+logo_loader = ImageLoader.new(find_file(@title_logo))
-+title_logo = Proc.new do |slide, canvas, x, y, w, h, simulation|
-+ unless simulation
-+ draw_x = canvas.width - logo_loader.width
-+ draw_y = canvas.height - logo_loader.height
-+ logo_loader.draw(canvas, draw_x, draw_y)
-+ end
-+ [x, y, w, h]
-+end
-+match(TitleSlide) do |slides|
-+ name2 = "title-logo"
-+ slides.delete_pre_draw_proc_by_name(name2)
-+ slides.add_pre_draw_proc(name2, &title_logo)
-+end
-+#----------------------------------------
-+# per slide header/footer style settings
-+#----------------------------------------
-+ at slide_header = "top.png"
-+# Headline Settings
-+loader_head = ImageLoader.new(find_file(@slide_header))
-+match(Slide, HeadLine) do |heads|
-+ heads.each do |head|
-+ head.add_pre_draw_proc("header_bg") do |canvas, x, y, w, h, simulation|
-+ unless simulation
-+ loader_head.resize(canvas.width, nil)
-+ loader_head.draw(canvas,
-+ x + w - canvas.width + @margin_left + @margin_right, 0)
-+ end
-+ [x, y, w, h]
-+ end
-+ end
-+ name = "head-line"
-+ delete_post_draw_proc_by_name(name)
-+ heads.margin_left = (canvas.width + @margin_left + @margin_right)/6.0
-+ heads.margin_right = @margin_right
-+ heads.margin_bottom = @margin_bottom * 0.5
-+ heads.margin_top = @margin_top
-+ heads.each do |head|
-+ headline_length = 0
-+ head.text.split(//u).each_with_index do |chr, idx|
-+ headline_length += chr.size > 1 ? 2 : 1
-+ end
-+ head.margin_top = @margin_top * 0.20 if headline_length >= 26
-+ end
-+ heads.prop_set("size", @xx_large_font_size )
-+ heads.prop_set("foreground", "#fff")
-+ loader_head.resize(canvas.width, nil)
-+ static_y = loader_head.height - @margin_top
-+ original_h = nil
-+ heads.add_pre_draw_proc do |head, canvas, x, y, w, h, simulation|
-+ original_h = h
-+ [x, y, w, h]
-+ end
-+ heads.add_post_draw_proc do |head, canvas, x, y, w, h, simulation|
-+ [x, static_y, w, original_h - static_y]
-+ end
-+end
-+# Footer settings
-+ at slide_footer = "bottom.png"
-+ at slide_banner = "debian-logo.png"
-+loader_foot = ImageLoader.new(find_file(@slide_footer))
-+loader_banner = ImageLoader.new(find_file(@slide_banner))
-+match(Slide) do |slides|
-+ slides.each do |slide|
-+ slide.add_post_draw_proc("footer") do |canvas, x, y, w, h, simulation|
-+ unless simulation
-+ footer_height = canvas.height/26.0 + screen_y(1) * 0.2
-+ loader_foot.resize(canvas.width, footer_height)
-+ loader_foot.draw(canvas, 0, canvas.height - footer_height)
-+ banner_height = canvas.height/26.0
-+ loader_banner.resize(nil, banner_height)
-+ banner_pos_x = canvas.width - loader_banner.width
-+ banner_pos_y = canvas.height - loader_banner.height - footer_height
-+ loader_banner.draw(canvas, banner_pos_x, banner_pos_y)
-+ end
-+ [x, y, w, h]
-+ end
-+ end
-+end
-+#----------------------------------------
-+# slide centering?
-+#----------------------------------------
-+ at slide_centering = true
-+slide_body = [Slide, Body]
-+match(*slide_body) do |bodies|
-+ bodies.vertical_centering = @slide_centering
-+end
-+#----------------------------------------
-+# TAKAHASHI method !!
-+#----------------------------------------
-+ at lightning_talk_proc_name = "lightning-debian"
-+ at lightning_talk_as_large_as_possible = true
-+include_theme("lightning-talk-toolkit")
-+match(Slide) do |slides|
-+ slides.each do |slide|
-+ if slide.lightning_talk?
-+ slide.headline.margin_left = @margin_left
-+ slide.lightning_talk
-+ end
-+ end
-+end
-+include_theme("per-slide-background-image")
-+
-diff --git a/lib/rabbit/theme/debian/property.rb b/lib/rabbit/theme/debian/property.rb
-new file mode 100644
-index 0000000..d0bfd8b
---- /dev/null
-+++ b/lib/rabbit/theme/debian/property.rb
-@@ -0,0 +1,3 @@
-+ at category = N_("Theme")
-+ at title = N_("Debian Theme")
-+ at description = N_("Debian GNU/Linux Theme")
diff --git a/debian/patches/series b/debian/patches/series
index a8c3074..42fba08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-Remove-RubyGems-Depends.patch
0004-Drop-test-unit-notify-for-package-build.patch
Import-testfixturesimage
-0004-Add-debian-theme-Closes-828214.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rabbit.git
More information about the Pkg-ruby-extras-commits
mailing list