[DRE-commits] [ruby-faraday] 01/12: Revert "tag the patch"

[Sebastien Badia]

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

sbadia-guest pushed a commit to branch master
in repository ruby-faraday.

commit 52ca8edf4a4a642058d308c01cf4c21b6c20e67f
Author: Sebastien Badia <seb at sebian.fr>
Date:   Fri Apr 11 15:54:49 2014 +0200

    Revert "tag the patch"
    
    This reverts commit f07d11ec30e837e1cdad0496b3fb942f06f91819.
    (Merged upstream)
---
 debian/patches/add-multibyte-txt.patch |  5 -----
 script/test                            | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/debian/patches/add-multibyte-txt.patch b/debian/patches/add-multibyte-txt.patch
index 8614565..3e7d7fa 100644
--- a/debian/patches/add-multibyte-txt.patch
+++ b/debian/patches/add-multibyte-txt.patch
@@ -1,8 +1,3 @@
-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 fbf1a0f..d45cb27 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
 

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