[DRE-commits] [ruby-toml] 02/06: Add/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 ruby-toml.

commit 27dfbabe2efba44a04c628f28a1bf4afa1941475
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Jan 26 10:53:56 2014 +0900

    Add/Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 .../0001-Use-two-digit-version-constraint.patch    | 31 +++++++++
 ...02-Drop-RubyGems-And-Bundler-Dependencies.patch | 78 ++++++++++++++++++++++
 debian/patches/Use-two-digit-version-constraint    | 34 ----------
 debian/patches/series                              |  3 +-
 4 files changed, 111 insertions(+), 35 deletions(-)

diff --git a/debian/patches/0001-Use-two-digit-version-constraint.patch b/debian/patches/0001-Use-two-digit-version-constraint.patch
new file mode 100644
index 0000000..49addb8
--- /dev/null
+++ b/debian/patches/0001-Use-two-digit-version-constraint.patch
@@ -0,0 +1,31 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Sun, 26 Jan 2014 10:46:05 +0900
+Subject: Use-two-digit-version-constraint
+Description: Use two-digit version constraint
+ upstream declares a dependency on multi_json < 1.8. Since it builds and tests
+ fine with 1.8.4, I think this is a mistake. A patch was submitted upstream.
+
+Author: Axel Wagner <mero at merovius.de>
+Origin: upstream
+Forwarded: not-needed
+Reviewed-By: Youhei SASAKI <uwabami at gfd-dennou.org>
+Last-Update: 2014-01-26
+
+---
+ Gemfile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Gemfile b/Gemfile
+index efc04b5..9e81195 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -4,7 +4,7 @@ source 'https://rubygems.org'
+ gemspec
+ 
+ group :test do
+-  gem 'multi_json', '~> 1.7.8'
++  gem 'multi_json', '~> 1.7'
+   gem 'minitest'
+   gem 'simplecov', :require => false
+   gem 'simplecov-gem-adapter', :require => false
diff --git a/debian/patches/0002-Drop-RubyGems-And-Bundler-Dependencies.patch b/debian/patches/0002-Drop-RubyGems-And-Bundler-Dependencies.patch
new file mode 100644
index 0000000..1eaa2d4
--- /dev/null
+++ b/debian/patches/0002-Drop-RubyGems-And-Bundler-Dependencies.patch
@@ -0,0 +1,78 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Sun, 26 Jan 2014 10:46:30 +0900
+Subject: Drop RubyGems And Bundler Dependencies
+Description: Drop RubyGems and Bundler Dependencies
+ Drop 'rubygems' and 'bundler' dependencies from test scripts.
+ This patches are Debian Specific
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/test_empty.rb        |  4 +---
+ test/test_generator.rb    | 13 +++++--------
+ test/test_parser.rb       |  5 +----
+ test/test_parser_hard.rb  |  3 +--
+ test/test_table_arrays.rb |  3 +--
+ test/tmp.rb               | 13 +++++--------
+ 6 files changed, 14 insertions(+), 27 deletions(-)
+
+--- ruby-toml.orig/test/test_empty.rb
++++ ruby-toml/test/test_empty.rb
+@@ -1,6 +1,4 @@
+-require 'rubygems'
+-require 'bundler/setup'
+-
++require 'multi_json'
+ require 'toml'
+ require 'minitest/autorun'
+ 
+--- ruby-toml.orig/test/test_generator.rb
++++ ruby-toml/test/test_generator.rb
+@@ -1,7 +1,4 @@
+-
+-require 'rubygems'
+-require 'bundler/setup'
+-
++require 'multi_json'
+ require 'toml'
+ require 'minitest/autorun'
+ 
+--- ruby-toml.orig/test/test_parser.rb
++++ ruby-toml/test/test_parser.rb
+@@ -1,7 +1,4 @@
+-
+-require 'rubygems'
+-require 'bundler/setup'
+-
++require 'multi_json'
+ require 'toml'
+ require 'minitest/autorun'
+ 
+--- ruby-toml.orig/test/test_parser_hard.rb
++++ ruby-toml/test/test_parser_hard.rb
+@@ -1,5 +1,4 @@
+-require 'rubygems'
+-require 'bundler/setup'
++require 'multi_json'
+ require 'toml'
+ require 'minitest/autorun'
+ 
+--- ruby-toml.orig/test/test_table_arrays.rb
++++ ruby-toml/test/test_table_arrays.rb
+@@ -1,5 +1,4 @@
+-require 'rubygems'
+-require 'bundler/setup'
++require 'multi_json'
+ require 'toml'
+ require 'minitest/autorun'
+ 
+--- ruby-toml.orig/test/tmp.rb
++++ ruby-toml/test/tmp.rb
+@@ -1,7 +1,4 @@
+-
+-require 'rubygems'
+-require 'bundler/setup'
+-
++require 'multi_json'
+ require 'toml'
+ 
+ doc = "
diff --git a/debian/patches/Use-two-digit-version-constraint b/debian/patches/Use-two-digit-version-constraint
deleted file mode 100644
index d63ece2..0000000
--- a/debian/patches/Use-two-digit-version-constraint
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Use two-digit version constraint
- upstream declares a dependency on multi_json < 1.8. Since it builds and tests
- fine with 1.8.4, I think this is a mistake. A patch was submitted upstream.
- .
- ruby-toml (0.1.0-1) UNRELEASED; urgency=medium
- .
-   * Initial release (Closes: #735290)
-Author: Axel Wagner <mero at merovius.de>
-Bug-Debian: http://bugs.debian.org/735290
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- ruby-toml-0.1.0.orig/Gemfile
-+++ ruby-toml-0.1.0/Gemfile
-@@ -4,7 +4,7 @@ source 'https://rubygems.org'
- gemspec
- 
- group :test do
--  gem 'multi_json', '~> 1.7.8'
-+  gem 'multi_json', '~> 1.7'
-   gem 'minitest'
-   gem 'simplecov', :require => false
-   gem 'simplecov-gem-adapter', :require => false
diff --git a/debian/patches/series b/debian/patches/series
index 520946a..4e49aa9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-Use-two-digit-version-constraint
+0001-Use-two-digit-version-constraint.patch
+0002-Drop-RubyGems-And-Bundler-Dependencies.patch

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