[DRE-commits] [ruby-prawn] 06/15: refresh patches

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-prawn.

commit 6497039a280b060e11707725ac35f6ae4c257903
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Aug 6 00:43:36 2014 +0200

    refresh patches
---
 .../0200_replace_BASEDIR_data_by_DATADIR.patch     | 24 ++--------------------
 .../0600_replace_require_relative_manual.patch     |  4 +---
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch b/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
index 4bbb40c..bea50e5 100644
--- a/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
+++ b/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
@@ -4,7 +4,7 @@ Last-Update: 2014-04-14
 
 --- a/lib/prawn.rb
 +++ b/lib/prawn.rb
-@@ -21,7 +21,9 @@
+@@ -19,7 +19,9 @@
    #
    #
    BASEDIR = File.expand_path(File.join(dir, '..'))
@@ -13,7 +13,7 @@ Last-Update: 2014-04-14
 +  # /usr/lib/ruby/vendor_ruby/prawn -> /usr/share/ruby-prawn/
 +  DATADIR = File.expand_path(File.join(dir, '..', '..', '..', 'share', 'ruby-prawn'))
  
-   FLOAT_PRECISION = 1.0e-9
+   VERSION = File.read("#{BASEDIR}/VERSION").strip
  
 --- a/spec/acceptance/png.rb
 +++ b/spec/acceptance/png.rb
@@ -34,23 +34,3 @@ Last-Update: 2014-04-14
  ]
  
  Prawn::Document.generate("png_types.pdf", :page_size => "A5") do
---- a/spec/cell_spec.rb
-+++ b/spec/cell_spec.rb
-@@ -471,7 +471,7 @@
-     end
- 
-     it "supports variant styles of the current font" do
--      font_path = "#{Prawn::BASEDIR}/data/fonts/Panic+Sans.dfont"
-+      font_path = "#{Prawn::DATADIR}/fonts/Panic+Sans.dfont"
-       @pdf.font_families.merge!("Panic Sans" => {
-         :normal    => { :file => font_path, :font => "PanicSans" },
-         :bold      => { :file => font_path, :font => "PanicSans-Bold" },
-@@ -492,7 +492,7 @@
- 
- 
-     it "uses the style of the current font if none given" do
--      font_path = "#{Prawn::BASEDIR}/data/fonts/Panic+Sans.dfont"
-+      font_path = "#{Prawn::DATADIR}/fonts/Panic+Sans.dfont"
-       @pdf.font_families.merge!("Panic Sans" => {
-         :normal    => { :file => font_path, :font => "PanicSans" },
-         :bold      => { :file => font_path, :font => "PanicSans-Bold" },
diff --git a/debian/patches/0600_replace_require_relative_manual.patch b/debian/patches/0600_replace_require_relative_manual.patch
index 3385b57..c46d036 100644
--- a/debian/patches/0600_replace_require_relative_manual.patch
+++ b/debian/patches/0600_replace_require_relative_manual.patch
@@ -1,12 +1,10 @@
 --- a/manual/example_helper.rb
 +++ b/manual/example_helper.rb
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
  # encoding: UTF-8
  
 -require_relative "../lib/prawn"
--require_relative "../lib/prawn/table"
 +require "prawn"
-+require "prawn/table"
  require "prawn/manual_builder"
  
  Prawn::ManualBuilder.manual_dir = File.dirname(__FILE__)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-prawn.git