[DRE-commits] [tdiary] 02/06: 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 7b1d5bc0abdf298d8f9986487efa97430c47453a
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Jun 26 17:19:17 2016 +0900

    Refresh patches:
    
    - drop 0003-update-rpaproxy-URI.patch: merge upstream
    - remove patch of squeese.rb, dropped upstream
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0001-10_core.patch                  | 19 ++--------
 debian/patches/0003-Update-rpaproxy-URI.patch      | 41 ----------------------
 .../0007-Replace-git-execution-from-gemspec.patch  |  8 +++--
 debian/patches/series                              |  1 -
 4 files changed, 7 insertions(+), 62 deletions(-)

diff --git a/debian/patches/0001-10_core.patch b/debian/patches/0001-10_core.patch
index 7005b71..24d4899 100644
--- a/debian/patches/0001-10_core.patch
+++ b/debian/patches/0001-10_core.patch
@@ -4,9 +4,8 @@ Date: Mon, 12 Aug 2013 05:14:55 +0900
 Subject: 10_core
 
 ---
- dot.htaccess           | 8 ++++++++
- misc/plugin/squeeze.rb | 3 ++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
+ dot.htaccess | 8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 diff --git a/dot.htaccess b/dot.htaccess
 index b8d452d..a344352 100644
@@ -31,17 +30,3 @@ index b8d452d..a344352 100644
 +	AuthUserFile  /home/foo/.htpasswd
 +	Require user  foo
 +</Files>
-diff --git a/misc/plugin/squeeze.rb b/misc/plugin/squeeze.rb
-index a13c084..d667230 100755
---- a/misc/plugin/squeeze.rb
-+++ b/misc/plugin/squeeze.rb
-@@ -21,7 +21,8 @@ mode = defined?(TDiary) ? "PLUGIN" : ENV["REQUEST_METHOD"]? "CGI" : "CMD"
- 
- if mode == "CMD" || mode == "CGI"
- 	output_path = "./html/"
--	tdiary_path = "."
-+#	tdiary_path = "." 2003/11/16 Daigo Moriwaki
-+	tdiary_path = "/usr/share/tdiary"
- 	tdiary_conf = "."
- 	suffix = ''
- 	all_data = false
diff --git a/debian/patches/0003-Update-rpaproxy-URI.patch b/debian/patches/0003-Update-rpaproxy-URI.patch
deleted file mode 100644
index 62c2935..0000000
--- a/debian/patches/0003-Update-rpaproxy-URI.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Mon, 12 Aug 2013 05:17:17 +0900
-Subject: Update rpaproxy URI
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- misc/plugin/amazon/amazonimg.rb | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/misc/plugin/amazon/amazonimg.rb b/misc/plugin/amazon/amazonimg.rb
-index a774d42..b15b4d5 100755
---- a/misc/plugin/amazon/amazonimg.rb
-+++ b/misc/plugin/amazon/amazonimg.rb
-@@ -14,7 +14,7 @@
- @amazon_aid = 'cshs-22'                  # Amazon Association ID
- @amazon_url = 'http://www.amazon.co.jp/exec/obidos/ASIN'
-                                          # URL of items in amazon
-- at amazon_ecs_url = 'http://honnomemo.appspot.com/rpaproxy/jp/'
-+ at amazon_ecs_url = 'http://rpaproxy.tdiary.org/rpaproxy/jp/'
-                                          # URL of Amazon ECS service
- #############################
- 
-@@ -39,12 +39,12 @@
- }
- 
- @amazon_ecs_url_hash = {
--  'us' => 'http://honnomemo.appspot.com/rpaproxy/us/',
--  'jp' => 'http://honnomemo.appspot.com/rpaproxy/jp/',
--  'fr' => 'http://honnomemo.appspot.com/rpaproxy/fr/',
--  'uk' => 'http://honnomemo.appspot.com/rpaproxy/uk/',
--  'de' => 'http://honnomemo.appspot.com/rpaproxy/de/',
--  'ca' => 'http://honnomemo.appspot.com/rpaproxy/ca/',
-+  'us' => 'http://rpaproxy.tdiary.org/rpaproxy/us/',
-+  'jp' => 'http://rpaproxy.tdiary.org/rpaproxy/jp/',
-+  'fr' => 'http://rpaproxy.tdiary.org/rpaproxy/fr/',
-+  'uk' => 'http://rpaproxy.tdiary.org/rpaproxy/uk/',
-+  'de' => 'http://rpaproxy.tdiary.org/rpaproxy/de/',
-+  'ca' => 'http://rpaproxy.tdiary.org/rpaproxy/ca/',
-   nil   => @amazon_ecs_url
- }
- 
diff --git a/debian/patches/0007-Replace-git-execution-from-gemspec.patch b/debian/patches/0007-Replace-git-execution-from-gemspec.patch
index 0afca16..4eb2552 100644
--- a/debian/patches/0007-Replace-git-execution-from-gemspec.patch
+++ b/debian/patches/0007-Replace-git-execution-from-gemspec.patch
@@ -4,12 +4,14 @@ 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(-)
+ 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 @@
+@@ -13,24 +13,7 @@ Gem::Specification.new do |spec|
    spec.homepage      = "http://www.tdiary.org/"
    spec.license       = "GPL2"
  
diff --git a/debian/patches/series b/debian/patches/series
index 7d93269..ff2cbe7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0001-10_core.patch
 0002-020_runnable_tdiary_convert2.patch
-0003-Update-rpaproxy-URI.patch
 0004-Add-Rack-Dependencies-for-CGI-mode.patch
 0005-Add-Pathname-Dependencies.patch
 0006-Add-Shebang.patch

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