[DRE-commits] [SCM] ruby-twitter4r.git branch, master, updated. debian/0.7.0-1-5-g2e32e45

[Taku YASUI]

The following commit has been merged in the master branch:
commit 7c6394be3bb2f080da35f6d5ebbadec07db2281b
Author: Taku YASUI <tach at debian.org>
Date:   Sat Apr 14 09:24:10 2012 +0900

    Add debian/patches from libtwitter-ruby

diff --git a/debian/patches/10_independent_of_rubygems.patch b/debian/patches/10_independent_of_rubygems.patch
new file mode 100644
index 0000000..4e72916
--- /dev/null
+++ b/debian/patches/10_independent_of_rubygems.patch
@@ -0,0 +1,20 @@
+--- a/lib/twitter.rb
++++ b/lib/twitter.rb
+@@ -1,5 +1,5 @@
+ #
+-require('rubygems')
++#require('rubygems')
+ 
+ module Twitter; end
+ 
+--- a/lib/twitter/meta.rb
++++ b/lib/twitter/meta.rb
+@@ -1,7 +1,7 @@
+ # meta.rb contains <tt>Twitter::Meta</tt> and related classes that
+ # help define the metadata of the <tt>Twitter4R</tt> project.
+ 
+-require('rubygems')
++#require('rubygems')
+ require('erb')
+ 
+ class Twitter::Meta #:nodoc:
diff --git a/debian/patches/20_fix_warnings.patch b/debian/patches/20_fix_warnings.patch
new file mode 100644
index 0000000..a5a5e9a
--- /dev/null
+++ b/debian/patches/20_fix_warnings.patch
@@ -0,0 +1,10 @@
+--- a/lib/twitter/client/base.rb
++++ b/lib/twitter/client/base.rb
+@@ -133,6 +133,7 @@
+       @@http_header ||= { 
+       	'User-Agent' => "Twitter4R v#{Twitter::Version.to_version} [#{self.class.config.user_agent}]",
+       	'Accept' => 'text/x-json',
++      	'Content-Type' => 'application/x-www-form-urlencoded',
+       	'X-Twitter-Client' => self.class.config.application_name,
+       	'X-Twitter-Client-Version' => self.class.config.application_version,
+       	'X-Twitter-Client-URL' => self.class.config.application_url,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5fee5bc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10_independent_of_rubygems.patch
+20_fix_warnings.patch

-- 
ruby-twitter4r.git