[DRE-commits] [tdiary] 07/10: Refresh patches

Sat Aug 17 12:10:01 UTC 2013

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

tach pushed a commit to branch feature/gem-transition-4.0.0
in repository tdiary.

commit 40fc051ce04bae7dc5ea92895bc19787b5d35bd7
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Aug 12 05:18:18 2013 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 .../patches/{10_core.patch => 0001-10_core.patch}  |   20 ++++++++--
 .../0002-020_runnable_tdiary_convert2.patch        |   20 ++++++++++
 debian/patches/0003-Update-rpaproxy-URI.patch      |   41 ++++++++++++++++++++
 debian/patches/020_runnable_tdiary_convert2        |    9 -----
 debian/patches/series                              |    5 ++-
 5 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/debian/patches/10_core.patch b/debian/patches/0001-10_core.patch
similarity index 56%
rename from debian/patches/10_core.patch
rename to debian/patches/0001-10_core.patch
index a4bc51d..fc1138a 100644
--- a/debian/patches/10_core.patch
+++ b/debian/patches/0001-10_core.patch
@@ -1,5 +1,15 @@
-Author: Daigo Moriwaki <daigo at debian.org>
-Description: No description.
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+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(-)
+
+diff --git a/dot.htaccess b/dot.htaccess
+index b8d452d..a344352 100644
 --- a/dot.htaccess
 +++ b/dot.htaccess
 @@ -1,6 +1,8 @@
@@ -11,7 +21,7 @@ Description: No description.
  #Options +FollowSymLinks
  
  # if making anchor style as 'YYYYMMDD.html', add some settings below.
-@@ -25,3 +27,9 @@
+@@ -25,3 +27,9 @@ AddType application/xml .rdf
  	Require user  foo
  </Files>
  
@@ -21,9 +31,11 @@ Description: No description.
 +	AuthUserFile  /home/foo/.htpasswd
 +	Require user  foo
 +</Files>
+diff --git a/misc/plugin/squeeze.rb b/misc/plugin/squeeze.rb
+index e802715..cf8451f 100644
 --- a/misc/plugin/squeeze.rb
 +++ b/misc/plugin/squeeze.rb
-@@ -21,7 +21,8 @@
+@@ -21,7 +21,8 @@ mode = defined?(TDiary) ? "PLUGIN" : ENV["REQUEST_METHOD"]? "CGI" : "CMD"
  
  if mode == "CMD" || mode == "CGI"
  	output_path = "./html/"
diff --git a/debian/patches/0002-020_runnable_tdiary_convert2.patch b/debian/patches/0002-020_runnable_tdiary_convert2.patch
new file mode 100644
index 0000000..2fef0f7
--- /dev/null
+++ b/debian/patches/0002-020_runnable_tdiary_convert2.patch
@@ -0,0 +1,20 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Mon, 12 Aug 2013 05:14:55 +0900
+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 801110d..2ee307f 100644
+--- a/misc/convert2.rb
++++ b/misc/convert2.rb
+@@ -1,5 +1,5 @@
+-# -*- coding: utf-8; -*-
+ #!/usr/bin/env ruby
++# -*- coding: utf-8; -*-
+ #
+ # convert2: convert diary data file format tDiary1 to tDiary2.
+ #
diff --git a/debian/patches/0003-Update-rpaproxy-URI.patch b/debian/patches/0003-Update-rpaproxy-URI.patch
new file mode 100644
index 0000000..137d449
--- /dev/null
+++ b/debian/patches/0003-Update-rpaproxy-URI.patch
@@ -0,0 +1,41 @@
+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 b3dc984..f328efb 100644
+--- 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/020_runnable_tdiary_convert2 b/debian/patches/020_runnable_tdiary_convert2
deleted file mode 100644
index 8d815b8..0000000
--- a/debian/patches/020_runnable_tdiary_convert2
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/misc/convert2.rb
-+++ b/misc/convert2.rb
-@@ -1,5 +1,5 @@
--# -*- coding: utf-8; -*-
- #!/usr/bin/env ruby
-+# -*- coding: utf-8; -*-
- #
- # convert2: convert diary data file format tDiary1 to tDiary2.
- #
diff --git a/debian/patches/series b/debian/patches/series
index 201a30a..fec070e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-10_core.patch
-020_runnable_tdiary_convert2
+0001-10_core.patch
+0002-020_runnable_tdiary_convert2.patch
+0003-Update-rpaproxy-URI.patch

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

