[DRE-commits] [SCM] ruby-http-parser.rb.git branch, master, updated. upstream/0.5.3-21-gb0f8f0b

[Per Andersson]

The following commit has been merged in the master branch:
commit be163465d21c4011c723c4b58a8c8cfa60d1d4d7
Author: Per Andersson <avtobiff at gmail.com>
Date:   Mon Jun 17 02:06:37 2013 +0200

    Refresh encoding patch

diff --git a/debian/patches/0001-fix-default-encoding.patch b/debian/patches/0001-fix-default-encoding.patch
new file mode 100644
index 0000000..d626c34
--- /dev/null
+++ b/debian/patches/0001-fix-default-encoding.patch
@@ -0,0 +1,21 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Mon, 17 Jun 2013 02:05:30 +0200
+Subject: fix-default-encoding
+
+---
+ spec/parser_spec.rb | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/spec/parser_spec.rb b/spec/parser_spec.rb
+index 7134476..f904185 100644
+--- a/spec/parser_spec.rb
++++ b/spec/parser_spec.rb
+@@ -1,3 +1,7 @@
++if defined? Encoding
++  Encoding.default_external = "UTF-8"
++end
++
+ require "spec_helper"
+ require "json"
+ 
diff --git a/debian/patches/fix-default-encoding.patch b/debian/patches/fix-default-encoding.patch
deleted file mode 100644
index a1825f7..0000000
--- a/debian/patches/fix-default-encoding.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Make UTF-8 default encoding
-Author: Cédric Boutillier
-Bug: https://github.com/tmm1/http_parser.rb/pull/28
-
---- a/spec/parser_spec.rb
-+++ b/spec/parser_spec.rb
-@@ -1,3 +1,7 @@
-+if defined? Encoding
-+  Encoding.default_external = "UTF-8"
-+end
-+
- require "spec_helper"
- require "json"
- 
diff --git a/debian/patches/series b/debian/patches/series
index e9f71ba..3220e9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix-default-encoding.patch
+0001-fix-default-encoding.patch

-- 
ruby-http-parser.rb.git