[DRE-commits] [atig] 02/06: Merge tag 'upstream/0.4.1'
Youhei SASAKI
uwabami-guest at alioth.debian.org
Sat Aug 31 09:37:01 UTC 2013
This is an automated email from the git hooks/post-receive script.
uwabami-guest pushed a commit to branch master
in repository atig.
commit e65ef2b9fcc09403797b6be9fd0aba3d66c42864
Merge: 22cec9a 4576e71
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Wed Aug 7 21:31:06 2013 +0900
Merge tag 'upstream/0.4.1'
Upstream version 0.4.1
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Conflicts:
Gemfile.lock
docs/changelog.rst
lib/atig/agent/noretweets.rb
lib/atig/oauth.rb
lib/atig/option.rb
lib/atig/version.rb
metadata.yml
spec/spec_helper.rb
.travis.yml | 5 +
Gemfile | 2 +-
Gemfile.lock | 44 +-
Rakefile | 6 +
atig.gemspec | 5 +-
checksums.yaml.gz | Bin 0 -> 268 bytes
debian/changelog | 2 +-
...-Remove-Bundler-and-Rubygems-Dependencies.patch | 2 +-
docs/OMakefile | 32 -
docs/OMakeroot | 45 -
docs/changelog.rst | 69 +-
docs/conf.py | 2 +-
docs/graphics.graffle | 1995 --------------------
docs/index.rst | 4 +-
lib/atig/agent.rb | 1 -
lib/atig/agent/following.rb | 6 +-
lib/atig/agent/full_list.rb | 4 +-
lib/atig/agent/list.rb | 20 +-
lib/atig/agent/list_status.rb | 5 +-
lib/atig/agent/mention.rb | 2 +-
lib/atig/agent/noretweets.rb | 2 +-
lib/atig/agent/other_list.rb | 18 -
lib/atig/agent/own_list.rb | 18 -
lib/atig/agent/user_stream.rb | 4 +-
lib/atig/channel/list.rb | 5 +-
lib/atig/command/autofix.rb | 1 +
lib/atig/command/command.rb | 4 +-
lib/atig/command/destroy.rb | 2 +-
lib/atig/command/dm.rb | 2 +-
lib/atig/command/favorite.rb | 2 +-
lib/atig/db/db.rb | 5 +-
lib/atig/gateway/channel.rb | 1 +
lib/atig/gateway/session.rb | 3 +-
lib/atig/ifilter/sanitize.rb | 1 +
lib/atig/oauth.rb | 1 +
lib/atig/option.rb | 2 +-
lib/atig/optparse.rb | 6 +
lib/atig/twitter.rb | 16 +-
lib/atig/url_escape.rb | 2 +-
lib/atig/version.rb | 2 +-
metadata.yml | 368 ++++
spec/command/dm_spec.rb | 2 +-
spec/command/favorite_spec.rb | 10 +-
spec/db/followings_spec.rb | 4 +
spec/option_spec.rb | 2 +-
spec/spec_helper.rb | 8 +-
46 files changed, 554 insertions(+), 2188 deletions(-)
diff --cc debian/changelog
index 738dfc4,0000000..6b190f6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- atig (0.3.8-1) UNRELEASED; urgency=low
++atig (0.4.1-1) UNRELEASED; urgency=low
+
+ * Initial release (Closes: #670130)
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org> Mon, 23 Apr 2012 18:24:52 +0900
diff --cc debian/patches/0001-Remove-Bundler-and-Rubygems-Dependencies.patch
index 4b163ed,0000000..1b0dab3
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-Bundler-and-Rubygems-Dependencies.patch
+++ b/debian/patches/0001-Remove-Bundler-and-Rubygems-Dependencies.patch
@@@ -1,91 -1,0 +1,91 @@@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Tue, 31 Jan 2012 00:31:24 +0900
+Subject: Remove Bundler and Rubygems Dependencies
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ lib/atig/bitly.rb | 1 -
+ lib/atig/db/sql.rb | 1 -
+ lib/atig/db/statuses.rb | 1 -
+ lib/atig/monkey.rb | 1 -
+ lib/atig/oauth.rb | 1 -
+ lib/atig/search.rb | 1 -
+ lib/atig/stream.rb | 1 -
+ spec/spec_helper.rb | 10 +++++-----
+ 8 files changed, 5 insertions(+), 12 deletions(-)
+
+--- 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'
+
+--- atig.orig/lib/atig/db/sql.rb
++++ atig/lib/atig/db/sql.rb
+@@ -1,6 +1,5 @@
+ # -*- mode:ruby; coding:utf-8 -*-
+
+-require 'rubygems'
+ require 'sqlite3'
+
+ module Atig
+--- 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'
+ require 'atig/db/transaction'
+-require 'rubygems'
+ require 'sqlite3'
+ require 'atig/db/roman'
+ require 'atig/db/sql'
+--- atig.orig/lib/atig/monkey.rb
++++ atig/lib/atig/monkey.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'net/irc'
+
+ # monkey hack
+--- 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'
+
+--- 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'
+--- atig.orig/lib/atig/stream.rb
++++ atig/lib/atig/stream.rb
+@@ -1,6 +1,5 @@
+ # -*- mode:ruby; coding:utf-8 -*-
+
+-require 'rubygems'
+ require 'json'
+ require 'uri'
+ require 'logger'
+--- atig.orig/spec/spec_helper.rb
++++ atig/spec/spec_helper.rb
+@@ -1,9 +1,9 @@
+ # -*- mode:ruby; coding:utf-8 -*-
+-require 'rubygems'
+-require 'bundler'
+-
+-Bundler.setup
+-Bundler.require :default, :test
++require 'sqlite3'
++require 'net/irc'
++require 'oauth'
++require 'rake' unless defined? Rake
++require 'json' unless defined? JSON
+
-
+ require 'atig/monkey'
++ require 'command_helper'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/atig.git
More information about the Pkg-ruby-extras-commits
mailing list