[DRE-commits] [ruby-toml] 03/04: Refresh patches: Drop 0001-Use-two-digit-version-constraint

[Youhei SASAKI]

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

uwabami-guest pushed a commit to tag debian/0.1.1-1
in repository ruby-toml.

commit 3b4214b4d1cc28c47077dc114ff3ba77a0e2cacd
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Thu Feb 27 21:33:22 2014 +0900

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

diff --git a/debian/patches/0001-Drop-RubyGems-And-Bundler-Dependencies.patch b/debian/patches/0001-Drop-RubyGems-And-Bundler-Dependencies.patch
new file mode 100644
index 0000000..72691f2
--- /dev/null
+++ b/debian/patches/0001-Drop-RubyGems-And-Bundler-Dependencies.patch
@@ -0,0 +1,87 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Sun, 26 Jan 2014 10:46:30 +0900
+Subject: Drop RubyGems And Bundler Dependencies
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/test_empty.rb        | 4 +---
+ test/test_generator.rb    | 5 +----
+ test/test_parser.rb       | 5 +----
+ test/test_parser_hard.rb  | 3 +--
+ test/test_table_arrays.rb | 3 +--
+ test/tmp.rb               | 5 +----
+ 6 files changed, 6 insertions(+), 19 deletions(-)
+
+diff --git a/test/test_empty.rb b/test/test_empty.rb
+index 4a1ee37..dfcedfa 100644
+--- a/test/test_empty.rb
++++ b/test/test_empty.rb
+@@ -1,6 +1,4 @@
+-require 'rubygems'
+-require 'bundler/setup'
+-
++require 'multi_json'
+ require 'toml'
+ require 'minitest/autorun'
+ 
+diff --git a/test/test_generator.rb b/test/test_generator.rb
+index 4da5746..a2002f1 100644
+--- a/test/test_generator.rb
++++ b/test/test_generator.rb
+@@ -1,7 +1,4 @@
+-
+-require 'rubygems'
+-require 'bundler/setup'
+-
++require 'multi_json'
+ require 'toml'
+ require 'minitest/autorun'
+ 
+diff --git a/test/test_parser.rb b/test/test_parser.rb
+index 14137da..b8b0c58 100644
+--- a/test/test_parser.rb
++++ b/test/test_parser.rb
+@@ -1,7 +1,4 @@
+-
+-require 'rubygems'
+-require 'bundler/setup'
+-
++require 'multi_json'
+ require 'toml'
+ require 'minitest/autorun'
+ 
+diff --git a/test/test_parser_hard.rb b/test/test_parser_hard.rb
+index 956eed8..7fbfb5a 100644
+--- a/test/test_parser_hard.rb
++++ b/test/test_parser_hard.rb
+@@ -1,5 +1,4 @@
+-require 'rubygems'
+-require 'bundler/setup'
++require 'multi_json'
+ require 'toml'
+ require 'minitest/autorun'
+ 
+diff --git a/test/test_table_arrays.rb b/test/test_table_arrays.rb
+index 26174dd..7e69f5e 100644
+--- a/test/test_table_arrays.rb
++++ b/test/test_table_arrays.rb
+@@ -1,5 +1,4 @@
+-require 'rubygems'
+-require 'bundler/setup'
++require 'multi_json'
+ require 'toml'
+ require 'minitest/autorun'
+ 
+diff --git a/test/tmp.rb b/test/tmp.rb
+index cc192d2..7d5fdfb 100644
+--- a/test/tmp.rb
++++ b/test/tmp.rb
+@@ -1,7 +1,4 @@
+-
+-require 'rubygems'
+-require 'bundler/setup'
+-
++require 'multi_json'
+ require 'toml'
+ 
+ doc = "
diff --git a/debian/patches/0001-Use-two-digit-version-constraint.patch b/debian/patches/0001-Use-two-digit-version-constraint.patch
deleted file mode 100644
index 49addb8..0000000
--- a/debian/patches/0001-Use-two-digit-version-constraint.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 1eaa2d4..0000000
--- a/debian/patches/0002-Drop-RubyGems-And-Bundler-Dependencies.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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/series b/debian/patches/series
index 4e49aa9..6e4bd6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Use-two-digit-version-constraint.patch
-0002-Drop-RubyGems-And-Bundler-Dependencies.patch
+0001-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