[DRE-commits] [tdiary] 02/04: Refresh patches: drop 0007-Remove-gemoji-dependency.patch

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository tdiary.

commit afbd58be425a2c9036af7ad065c74b4b235f49ff
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Jan 18 16:39:56 2016 +0900

    Refresh patches: drop 0007-Remove-gemoji-dependency.patch
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0007-Remove-gemoji-dependency.patch | 34 --------------------
 .../0007-Replace-git-execution-from-gemspec.patch  | 37 ++++++++++++++++++++++
 .../0008-Replace-git-execution-from-gemspec.patch  | 22 -------------
 debian/patches/series                              |  3 +-
 4 files changed, 38 insertions(+), 58 deletions(-)

diff --git a/debian/patches/0007-Remove-gemoji-dependency.patch b/debian/patches/0007-Remove-gemoji-dependency.patch
deleted file mode 100644
index 5e9f9e6..0000000
--- a/debian/patches/0007-Remove-gemoji-dependency.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Thu, 26 Nov 2015 20:58:50 +0900
-Subject: Remove gemoji dependency
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- Gemfile                | 1 -
- lib/tdiary/core_ext.rb | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Gemfile b/Gemfile
-index 5d2d7b0..e2fef14 100644
---- a/Gemfile
-+++ b/Gemfile
-@@ -4,7 +4,6 @@ gem 'rack'
- gem 'sprockets'
- gem 'hikidoc'
- gem 'fastimage'
--gem 'gemoji'
- gem 'mail'
- 
- group :coffee do
-diff --git a/lib/tdiary/core_ext.rb b/lib/tdiary/core_ext.rb
-index efb0f7c..0e28bc1 100644
---- a/lib/tdiary/core_ext.rb
-+++ b/lib/tdiary/core_ext.rb
-@@ -1,6 +1,6 @@
- # -*- coding: utf-8 -*-
- 
--require 'gemoji'
-+require 'tdiary/emoji'
- 
- module TDiary
- 	module RequestExtension
diff --git a/debian/patches/0007-Replace-git-execution-from-gemspec.patch b/debian/patches/0007-Replace-git-execution-from-gemspec.patch
new file mode 100644
index 0000000..0afca16
--- /dev/null
+++ b/debian/patches/0007-Replace-git-execution-from-gemspec.patch
@@ -0,0 +1,37 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Fri, 27 Nov 2015 01:42:35 +0900
+Subject: Replace git execution from gemspec
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ tdiary.gemspec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tdiary.gemspec
++++ b/tdiary.gemspec
+@@ -13,24 +13,7 @@
+   spec.homepage      = "http://www.tdiary.org/"
+   spec.license       = "GPL2"
+ 
+-  spec.files         = Dir[
+-    'ChangeLog',
+-    'config.ru',
+-    'Gemfile',
+-    'Gemfile.lock',
+-    'README.md',
+-    'Rakefile',
+-    'tdiary.conf*',
+-    'bin/**/*',
+-    'doc/**/*',
+-    'js/**/*',
+-    'lib/**/*',
+-    'misc/**/*',
+-    'public/**/*',
+-    'theme/**/*',
+-    'vendor/**/*',
+-    'views/**/*'
+-  ]
++  spec.files         = Dir[".coveralls.yml",".gitignore",".travis.yml","ChangeLog","Gemfile","Gemfile.lock","LICENSE","Procfile","README.md","Rakefile","bin/tdiary","config.ru","data/.htaccess","doc/HOWTO-authenticate-in-rack.md","doc/HOWTO-make-io.md","doc/HOWTO-make-plugin.md","doc/HOWTO-make-theme.md","doc/HOWTO-testing-tDiary.md","doc/HOWTO-use-plugin.md","doc/HOWTO-write-tDiary.en.md","doc/HOWTO-write-tDiary.md","doc/INSTALL-cgi.md","doc/INSTALL-paas.md","doc/INSTALL-rack.md","doc/ [...]
+   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+   spec.require_paths = ["lib"]
+ 
diff --git a/debian/patches/0008-Replace-git-execution-from-gemspec.patch b/debian/patches/0008-Replace-git-execution-from-gemspec.patch
deleted file mode 100644
index 13ec0b9..0000000
--- a/debian/patches/0008-Replace-git-execution-from-gemspec.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Fri, 27 Nov 2015 01:42:35 +0900
-Subject: Replace git execution from gemspec
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- tdiary.gemspec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tdiary.gemspec b/tdiary.gemspec
-index 8d63225..7698a5a 100644
---- a/tdiary.gemspec
-+++ b/tdiary.gemspec
-@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
-   spec.homepage      = "http://www.tdiary.org/"
-   spec.license       = "GPL2"
- 
--  spec.files         = `git ls-files`.split($/)
-+  spec.files         = [".coveralls.yml",".gitignore",".travis.yml","ChangeLog","Gemfile","Gemfile.lock","Gruntfile.js","LICENSE","Procfile","README.md","Rakefile","bin/tdiary","bower.json","config.ru","data/.htaccess","doc/HOWTO-authenticate-in-rack.md","doc/HOWTO-make-io.md","doc/HOWTO-make-plugin.md","doc/HOWTO-make-theme.md","doc/HOWTO-testing-tDiary.md","doc/HOWTO-use-plugin.md","doc/HOWTO-write-tDiary.en.md","doc/HOWTO-write-tDiary.md","doc/INSTALL-cgi.md","doc/INSTALL-paas.md","d [...]
-   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-   spec.require_paths = ["lib"]
diff --git a/debian/patches/series b/debian/patches/series
index cd978f1..7d93269 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@
 0004-Add-Rack-Dependencies-for-CGI-mode.patch
 0005-Add-Pathname-Dependencies.patch
 0006-Add-Shebang.patch
-0007-Remove-gemoji-dependency.patch
-0008-Replace-git-execution-from-gemspec.patch
+0007-Replace-git-execution-from-gemspec.patch

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