[DRE-commits] [SCM] atig.git branch, master, updated. upstream/0.3.6-15-g76fd335

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 2f24526a392fdb7babe5c3b37999431675b0d662
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Feb 3 20:40:25 2013 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/patches/0001-Remove-Bundler-and-Rubygems-Dependencies.patch b/debian/patches/0001-Remove-Bundler-and-Rubygems-Dependencies.patch
index 06a1282..4b163ed 100644
--- a/debian/patches/0001-Remove-Bundler-and-Rubygems-Dependencies.patch
+++ b/debian/patches/0001-Remove-Bundler-and-Rubygems-Dependencies.patch
@@ -14,20 +14,16 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  spec/spec_helper.rb     |   10 +++++-----
  8 files changed, 5 insertions(+), 12 deletions(-)
 
-diff --git a/lib/atig/bitly.rb b/lib/atig/bitly.rb
-index 4675954..0046f25 100644
---- a/lib/atig/bitly.rb
-+++ b/lib/atig/bitly.rb
+--- atig.orig/lib/atig/bitly.rb
++++ atig/lib/atig/bitly.rb
 @@ -1,5 +1,4 @@
  # -*- mode:ruby; coding:utf-8 -*-
 -require 'rubygems'
  require 'json'
  require 'atig/http'
  
-diff --git a/lib/atig/db/sql.rb b/lib/atig/db/sql.rb
-index ccf0b4d..df425b1 100644
---- a/lib/atig/db/sql.rb
-+++ b/lib/atig/db/sql.rb
+--- atig.orig/lib/atig/db/sql.rb
++++ atig/lib/atig/db/sql.rb
 @@ -1,6 +1,5 @@
  # -*- mode:ruby; coding:utf-8 -*-
  
@@ -35,10 +31,8 @@ index ccf0b4d..df425b1 100644
  require 'sqlite3'
  
  module Atig
-diff --git a/lib/atig/db/statuses.rb b/lib/atig/db/statuses.rb
-index 4080d48..e753651 100644
---- a/lib/atig/db/statuses.rb
-+++ b/lib/atig/db/statuses.rb
+--- atig.orig/lib/atig/db/statuses.rb
++++ atig/lib/atig/db/statuses.rb
 @@ -1,7 +1,6 @@
  # -*- mode:ruby; coding:utf-8 -*-
  require 'atig/db/listenable'
@@ -47,38 +41,30 @@ index 4080d48..e753651 100644
  require 'sqlite3'
  require 'atig/db/roman'
  require 'atig/db/sql'
-diff --git a/lib/atig/monkey.rb b/lib/atig/monkey.rb
-index ec5a652..c7cdfab 100644
---- a/lib/atig/monkey.rb
-+++ b/lib/atig/monkey.rb
+--- atig.orig/lib/atig/monkey.rb
++++ atig/lib/atig/monkey.rb
 @@ -1,4 +1,3 @@
 -require 'rubygems'
  require 'net/irc'
  
  # monkey hack
-diff --git a/lib/atig/oauth.rb b/lib/atig/oauth.rb
-index f23f136..40d4bbd 100644
---- a/lib/atig/oauth.rb
-+++ b/lib/atig/oauth.rb
+--- atig.orig/lib/atig/oauth.rb
++++ atig/lib/atig/oauth.rb
 @@ -1,5 +1,4 @@
  # -*- mode:ruby; coding:utf-8 -*-
 -require 'rubygems'
  require 'oauth'
  require 'atig/oauth-patch'
  
-diff --git a/lib/atig/search.rb b/lib/atig/search.rb
-index 26ccdba..6947e50 100644
---- a/lib/atig/search.rb
-+++ b/lib/atig/search.rb
+--- atig.orig/lib/atig/search.rb
++++ atig/lib/atig/search.rb
 @@ -1,4 +1,3 @@
 -require 'rubygems'
  require 'json'
  require 'atig/http'
  require 'atig/url_escape'
-diff --git a/lib/atig/stream.rb b/lib/atig/stream.rb
-index ff846bf..069c0df 100644
---- a/lib/atig/stream.rb
-+++ b/lib/atig/stream.rb
+--- atig.orig/lib/atig/stream.rb
++++ atig/lib/atig/stream.rb
 @@ -1,6 +1,5 @@
  # -*- mode:ruby; coding:utf-8 -*-
  
@@ -86,10 +72,8 @@ index ff846bf..069c0df 100644
  require 'json'
  require 'uri'
  require 'logger'
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 6658fc7..aebee1b 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
+--- atig.orig/spec/spec_helper.rb
++++ atig/spec/spec_helper.rb
 @@ -1,9 +1,9 @@
  # -*- mode:ruby; coding:utf-8 -*-
 -require 'rubygems'
@@ -103,5 +87,5 @@ index 6658fc7..aebee1b 100644
 +require 'rake' unless defined? Rake
 +require 'json' unless defined? JSON
  
- $:.unshift(File.expand_path( '../lib', File.dirname(__FILE__) ) )
  
+ require 'atig/monkey'
diff --git a/debian/patches/series b/debian/patches/series
index ec840f5..92e1533 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Remove-Bundler-and-Rubygems-Dependencies.patch
-0002-Disabled_Update_Checker.patch

-- 
atig.git