[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 b14c71cdf5c44775222b42d06cf41a4be53efcf1
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue Jun 12 21:58:27 2012 +0200

    add upstream patch 1001_fix_encoding_in_font_spec.patch. Closes: #676199

diff --git a/debian/patches/1001_fix_encoding_in_font_spec.patch b/debian/patches/1001_fix_encoding_in_font_spec.patch
new file mode 100644
index 0000000..6d641a7
--- /dev/null
+++ b/debian/patches/1001_fix_encoding_in_font_spec.patch
@@ -0,0 +1,21 @@
+Description: Fix encoding of the result of a test of font_spec.rb
+ encode_text method returns in that case a 8 bit ASCII string, not 7 bit.
+From: James Healy <jimmy at deefa.com>
+Origin: https://github.com/prawnpdf/prawn/commit/0ceab27
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676199 
+Bug: https: https://github.com/prawnpdf/prawn/issues/357
+Last-Update: 2011-06-12
+
+--- a/spec/font_spec.rb
++++ b/spec/font_spec.rb
+@@ -293,8 +293,8 @@
+   it "should encode text without kerning by default" do
+     @activa.encode_text("To").should == [[0, "To"]]
+ 
+-    tele = (RUBY_VERSION < '1.9') ? "T\216l\216" :
+-      "T\216l\216".force_encoding("US-ASCII")
++    tele = "T\216l\216"
++    tele.force_encoding("binary") if tele.respond_to?(:force_encoding)
+     @activa.encode_text("Télé").should == [[0, tele]]
+ 
+     @activa.encode_text("Technology").should == [[0, "Technology"]]
diff --git a/debian/patches/series b/debian/patches/series
index e178833..eaa2056 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0405_use_system_fonts_manual.patch
 0500_disable_tests_using_removed_files.patch
 0600_add_require_date_table_cell.rb
+1001_fix_encoding_in_font_spec.patch

-- 
ruby-prawn.git