[DRE-commits] [tdiary] 02/04: Refresh patches

[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 1495083f4895bec123a0fbf7b51ac3dd62eed4ae
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Aug 21 17:39:12 2016 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0002-020_runnable_tdiary_convert2.patch       | 5 +----
 debian/patches/0004-Add-Rack-Dependencies-for-CGI-mode.patch | 5 +----
 debian/patches/0005-Add-Pathname-Dependencies.patch          | 4 +---
 debian/patches/0006-Add-Shebang.patch                        | 7 +++----
 debian/patches/0007-Replace-git-execution-from-gemspec.patch | 6 ++----
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/debian/patches/0002-020_runnable_tdiary_convert2.patch b/debian/patches/0002-020_runnable_tdiary_convert2.patch
index 3e46897..2b1f671 100644
--- a/debian/patches/0002-020_runnable_tdiary_convert2.patch
+++ b/debian/patches/0002-020_runnable_tdiary_convert2.patch
@@ -7,12 +7,9 @@ Subject: 020_runnable_tdiary_convert2
  misc/convert2.rb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/misc/convert2.rb b/misc/convert2.rb
-index 34261fc..84cf816 100755
 --- a/misc/convert2.rb
 +++ b/misc/convert2.rb
-@@ -1,5 +1,5 @@
--# -*- coding: utf-8; -*-
+@@ -1,4 +1,5 @@
  #!/usr/bin/env ruby
 +# -*- coding: utf-8; -*-
  #
diff --git a/debian/patches/0004-Add-Rack-Dependencies-for-CGI-mode.patch b/debian/patches/0004-Add-Rack-Dependencies-for-CGI-mode.patch
index 64e9630..97d32d4 100644
--- a/debian/patches/0004-Add-Rack-Dependencies-for-CGI-mode.patch
+++ b/debian/patches/0004-Add-Rack-Dependencies-for-CGI-mode.patch
@@ -7,12 +7,9 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  lib/tdiary/request.rb | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/lib/tdiary/request.rb b/lib/tdiary/request.rb
-index b80fac2..7dd8ad9 100644
 --- a/lib/tdiary/request.rb
 +++ b/lib/tdiary/request.rb
-@@ -1,5 +1,6 @@
- # -*- coding: utf-8 -*-
+@@ -1,4 +1,5 @@
  # stolen from okkez http://github.com/hiki/hiki/blob/rack/hiki/request.rb
 +require 'rack'
  module TDiary
diff --git a/debian/patches/0005-Add-Pathname-Dependencies.patch b/debian/patches/0005-Add-Pathname-Dependencies.patch
index 9fe4e36..8d42eda 100644
--- a/debian/patches/0005-Add-Pathname-Dependencies.patch
+++ b/debian/patches/0005-Add-Pathname-Dependencies.patch
@@ -7,11 +7,9 @@ Subject: Add-Pathname-Dependencies
  lib/tdiary/io/plugin_pstore.rb | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/lib/tdiary/io/plugin_pstore.rb b/lib/tdiary/io/plugin_pstore.rb
-index 8b357fb..02d1535 100644
 --- a/lib/tdiary/io/plugin_pstore.rb
 +++ b/lib/tdiary/io/plugin_pstore.rb
-@@ -3,6 +3,7 @@
+@@ -2,6 +2,7 @@
  # module io/plugin_pstore
  # 	default plugin storage implemented by PStore
  #
diff --git a/debian/patches/0006-Add-Shebang.patch b/debian/patches/0006-Add-Shebang.patch
index 76501f1..8ebdde5 100644
--- a/debian/patches/0006-Add-Shebang.patch
+++ b/debian/patches/0006-Add-Shebang.patch
@@ -7,12 +7,11 @@ Subject: Add_Shebang
  lib/tdiary/tasks/server.rake | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/lib/tdiary/tasks/server.rake b/lib/tdiary/tasks/server.rake
-index bf161ac..d1f3e3b 100755
 --- a/lib/tdiary/tasks/server.rake
 +++ b/lib/tdiary/tasks/server.rake
-@@ -1,3 +1,4 @@
+@@ -1,3 +1,5 @@
 +#! /usr/bin/ruby
- # -*- coding: utf-8; -*-
++# -*- coding: utf-8; -*-
  #
  # server: script for running standalone tdiary cgi server.
+ #
diff --git a/debian/patches/0007-Replace-git-execution-from-gemspec.patch b/debian/patches/0007-Replace-git-execution-from-gemspec.patch
index 4eb2552..2ad6a8a 100644
--- a/debian/patches/0007-Replace-git-execution-from-gemspec.patch
+++ b/debian/patches/0007-Replace-git-execution-from-gemspec.patch
@@ -7,11 +7,9 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  tdiary.gemspec | 19 +------------------
  1 file changed, 1 insertion(+), 18 deletions(-)
 
-diff --git a/tdiary.gemspec b/tdiary.gemspec
-index fdc80d4..af44883 100644
 --- a/tdiary.gemspec
 +++ b/tdiary.gemspec
-@@ -13,24 +13,7 @@ Gem::Specification.new do |spec|
+@@ -12,24 +12,7 @@
    spec.homepage      = "http://www.tdiary.org/"
    spec.license       = "GPL2"
  
@@ -33,7 +31,7 @@ index fdc80d4..af44883 100644
 -    '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.files         = Dir[".coveralls.yml" ".dockerignore" ".gitignore" ".travis.yml" "ChangeLog" "Dockerfile" "Gemfile" "Gemfile.lock" "LICENSE" "Procfile" "README.md" "Rakefile" "app.json" "benchmark/benchmark_amazon_plugin.rb" "benchmark/benchmark_io_default.rb" "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-wri [...]
    spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
    spec.require_paths = ["lib"]
  

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