[DRE-commits] [SCM] ruby-faraday.git branch, master, updated. upstream/0.8.7-20-g1d8e656

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit f07d11ec30e837e1cdad0496b3fb942f06f91819
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon May 20 19:48:23 2013 +0530

    tag the patch

diff --git a/debian/patches/add-multibyte-txt.patch b/debian/patches/add-multibyte-txt.patch
index 3e7d7fa..8614565 100644
--- a/debian/patches/add-multibyte-txt.patch
+++ b/debian/patches/add-multibyte-txt.patch
@@ -1,3 +1,8 @@
+Description: add missing file from upstream git
+Author: Praveen Arimbrathodiyil <praveen at debian.org>
+Bug: https://github.com/lostisland/faraday/issues/273
+Forwarded: yes
+
 --- /dev/null
 +++ b/test/multibyte.txt
 @@ -0,0 +1 @@
diff --git a/script/test b/script/test
index d45cb27..fbf1a0f 100755
--- a/script/test
+++ b/script/test
@@ -12,16 +12,16 @@
 #   $ script/test excon typhoeus
 #   $ SSL=yes script/test net_http -- -n /ssl/
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup
-rescue Bundler::GemNotFound
-  $stderr.print "Error: "
-  $stderr.puts $!.message
-  warn "Run `bundle install` to install missing gems."
-  exit 1
-end
+#require 'rubygems'
+#require 'bundler'
+#begin
+#  Bundler.setup
+#rescue Bundler::GemNotFound
+#  $stderr.print "Error: "
+#  $stderr.puts $!.message
+#  warn "Run `bundle install` to install missing gems."
+#  exit 1
+#end
 
 $VERBOSE = true
 

-- 
ruby-faraday.git