[DRE-commits] [SCM] ruby-prawn.git branch, master, updated. debian/1.0.0_rc1+dfsg1-1-6-g633ed16

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit bfb4ac3ca5d12b0e37d6768b2132ea5ff9c2463f
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue Jun 12 22:35:55 2012 +0200

    Set external encoding to successfully build the manual

diff --git a/debian/patches/1002_define_external_encoding_for_manual.patch b/debian/patches/1002_define_external_encoding_for_manual.patch
new file mode 100644
index 0000000..2cbd0b9
--- /dev/null
+++ b/debian/patches/1002_define_external_encoding_for_manual.patch
@@ -0,0 +1,18 @@
+Description: Set default external encoding with Ruby 1.9 for the manual
+ This is needed to successfully build the manual on systems with non unicode
+ locale
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Bug: https://github.com/prawnpdf/prawn/pull/358
+Last-Update: 2012-06-12
+
+--- a/manual/manual/manual.rb
++++ b/manual/manual/manual.rb
+@@ -2,6 +2,8 @@
+ #
+ # Generates the Prawn by example manual.
+ #
++Encoding.default_external = "UTF-8" if defined? Encoding
++
+ require File.expand_path(File.join(File.dirname(__FILE__),
+                                    %w[.. example_helper]))
+ 
diff --git a/debian/patches/series b/debian/patches/series
index eaa2056..7ab690d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0500_disable_tests_using_removed_files.patch
 0600_add_require_date_table_cell.rb
 1001_fix_encoding_in_font_spec.patch
+1002_define_external_encoding_for_manual.patch

-- 
ruby-prawn.git