[DRE-commits] [ruby-msgpack] 04/05: Update patches for version 1.0.0
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Fri Jul 29 14:05:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository ruby-msgpack.
commit fdaa0c345573ae218747cd3e6f1e966ccf41335a
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Fri Jul 29 16:09:26 2016 +0300
Update patches for version 1.0.0
---
...1-Fix-paths-for-spec_helper-random_compat.patch | 193 +++++++++++++++++++++
debian/patches/10_fix_test_path | 66 -------
debian/patches/11_fix_test_patch.patch | 55 ------
debian/patches/series | 3 +-
4 files changed, 194 insertions(+), 123 deletions(-)
diff --git a/debian/patches/0001-Fix-paths-for-spec_helper-random_compat.patch b/debian/patches/0001-Fix-paths-for-spec_helper-random_compat.patch
new file mode 100644
index 0000000..0885705
--- /dev/null
+++ b/debian/patches/0001-Fix-paths-for-spec_helper-random_compat.patch
@@ -0,0 +1,193 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Fri, 29 Jul 2016 16:17:14 +0300
+Subject: Fix paths for spec_helper & random_compat
+
+---
+ spec/cases_spec.rb | 2 +-
+ spec/cruby/buffer_io_spec.rb | 4 ++--
+ spec/cruby/buffer_packer.rb | 2 +-
+ spec/cruby/buffer_spec.rb | 4 ++--
+ spec/cruby/buffer_unpacker.rb | 2 +-
+ spec/cruby/unpacker_spec.rb | 2 +-
+ spec/ext_value_spec.rb | 2 +-
+ spec/factory_spec.rb | 2 +-
+ spec/format_spec.rb | 2 +-
+ spec/msgpack_spec.rb | 2 +-
+ spec/pack_spec.rb | 2 +-
+ spec/packer_spec.rb | 2 +-
+ spec/spec_helper.rb | 1 +
+ spec/unpack_spec.rb | 2 +-
+ spec/unpacker_spec.rb | 2 +-
+ 15 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/spec/cases_spec.rb b/spec/cases_spec.rb
+index 6a71b41..cde51b3 100644
+--- a/spec/cases_spec.rb
++++ b/spec/cases_spec.rb
+@@ -1,4 +1,4 @@
+-require 'spec_helper'
++require 'spec/spec_helper'
+ require 'json'
+
+ describe MessagePack do
+diff --git a/spec/cruby/buffer_io_spec.rb b/spec/cruby/buffer_io_spec.rb
+index 3c012e8..95a562b 100644
+--- a/spec/cruby/buffer_io_spec.rb
++++ b/spec/cruby/buffer_io_spec.rb
+@@ -1,5 +1,5 @@
+-require 'spec_helper'
+-require 'random_compat'
++require 'spec/spec_helper'
++require 'spec/random_compat'
+
+ require 'stringio'
+ if defined?(Encoding)
+diff --git a/spec/cruby/buffer_packer.rb b/spec/cruby/buffer_packer.rb
+index f9cd1df..1259320 100644
+--- a/spec/cruby/buffer_packer.rb
++++ b/spec/cruby/buffer_packer.rb
+@@ -1,5 +1,5 @@
+ # encoding: ascii-8bit
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ require 'stringio'
+ if defined?(Encoding)
+diff --git a/spec/cruby/buffer_spec.rb b/spec/cruby/buffer_spec.rb
+index c13e1c7..858c71c 100644
+--- a/spec/cruby/buffer_spec.rb
++++ b/spec/cruby/buffer_spec.rb
+@@ -1,5 +1,5 @@
+-require 'spec_helper'
+-require 'random_compat'
++require 'spec/spec_helper'
++require 'spec/random_compat'
+
+ describe Buffer do
+ STATIC_EXAMPLES = {}
+diff --git a/spec/cruby/buffer_unpacker.rb b/spec/cruby/buffer_unpacker.rb
+index 2d1f0a3..ed289da 100644
+--- a/spec/cruby/buffer_unpacker.rb
++++ b/spec/cruby/buffer_unpacker.rb
+@@ -1,5 +1,5 @@
+ # encoding: ascii-8bit
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ describe Unpacker do
+ let :unpacker do
+diff --git a/spec/cruby/unpacker_spec.rb b/spec/cruby/unpacker_spec.rb
+index 2f55c4d..0d59e18 100644
+--- a/spec/cruby/unpacker_spec.rb
++++ b/spec/cruby/unpacker_spec.rb
+@@ -1,5 +1,5 @@
+ # encoding: ascii-8bit
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ describe Unpacker do
+ let :unpacker do
+diff --git a/spec/ext_value_spec.rb b/spec/ext_value_spec.rb
+index eb0447c..8e5db98 100644
+--- a/spec/ext_value_spec.rb
++++ b/spec/ext_value_spec.rb
+@@ -1,5 +1,5 @@
+ # encoding: ascii-8bit
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ describe MessagePack::ExtensionValue do
+ subject do
+diff --git a/spec/factory_spec.rb b/spec/factory_spec.rb
+index e036b66..6c10d16 100644
+--- a/spec/factory_spec.rb
++++ b/spec/factory_spec.rb
+@@ -1,5 +1,5 @@
+ # encoding: ascii-8bit
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ describe MessagePack::Factory do
+ subject do
+diff --git a/spec/format_spec.rb b/spec/format_spec.rb
+index d416eaa..ecdedb4 100644
+--- a/spec/format_spec.rb
++++ b/spec/format_spec.rb
+@@ -1,5 +1,5 @@
+ # encoding: ascii-8bit
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ describe MessagePack do
+ it "nil" do
+diff --git a/spec/msgpack_spec.rb b/spec/msgpack_spec.rb
+index 169261a..a629389 100644
+--- a/spec/msgpack_spec.rb
++++ b/spec/msgpack_spec.rb
+@@ -1,6 +1,6 @@
+ # encoding: ascii-8bit
+
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ def utf8enc(str)
+ str.encode('UTF-8')
+diff --git a/spec/pack_spec.rb b/spec/pack_spec.rb
+index d7ea533..9c90db3 100644
+--- a/spec/pack_spec.rb
++++ b/spec/pack_spec.rb
+@@ -1,5 +1,5 @@
+ # encoding: ascii-8bit
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ require 'stringio'
+ if defined?(Encoding)
+diff --git a/spec/packer_spec.rb b/spec/packer_spec.rb
+index 866de5d..822dd45 100644
+--- a/spec/packer_spec.rb
++++ b/spec/packer_spec.rb
+@@ -1,5 +1,5 @@
+ # encoding: ascii-8bit
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ require 'stringio'
+ require 'tempfile'
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index df6fbe1..b383402 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -13,6 +13,7 @@ if ENV['GC_STRESS']
+ GC.stress = true
+ end
+
++require 'rspec'
+ require 'msgpack'
+
+ def java?
+diff --git a/spec/unpack_spec.rb b/spec/unpack_spec.rb
+index 73aab5e..38cf123 100644
+--- a/spec/unpack_spec.rb
++++ b/spec/unpack_spec.rb
+@@ -1,5 +1,5 @@
+ # encoding: ascii-8bit
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ require 'stringio'
+ if defined?(Encoding)
+diff --git a/spec/unpacker_spec.rb b/spec/unpacker_spec.rb
+index ac1076c..b08c03f 100644
+--- a/spec/unpacker_spec.rb
++++ b/spec/unpacker_spec.rb
+@@ -4,7 +4,7 @@ require 'stringio'
+ require 'tempfile'
+ require 'zlib'
+
+-require 'spec_helper'
++require 'spec/spec_helper'
+
+ describe MessagePack::Unpacker do
+ let :unpacker do
diff --git a/debian/patches/10_fix_test_path b/debian/patches/10_fix_test_path
deleted file mode 100644
index f9e072f..0000000
--- a/debian/patches/10_fix_test_path
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: fix path to spec files from upstream
-Author: Taku YASUI <tach at debian.org>
-
---- a/spec/cases_spec.rb
-+++ b/spec/cases_spec.rb
-@@ -1,4 +1,4 @@
--require 'spec_helper'
-+require 'spec/spec_helper'
- require 'json'
-
- describe MessagePack do
---- a/spec/format_spec.rb
-+++ b/spec/format_spec.rb
-@@ -1,5 +1,5 @@
- # encoding: ascii-8bit
--require 'spec_helper'
-+require 'spec/spec_helper'
-
- describe MessagePack do
- it "nil" do
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -13,6 +13,7 @@
- GC.stress = true
- end
-
-+require 'rspec'
- require 'msgpack'
-
- if /java/ =~ RUBY_PLATFORM
---- a/spec/pack_spec.rb
-+++ b/spec/pack_spec.rb
-@@ -1,5 +1,5 @@
- # encoding: ascii-8bit
--require 'spec_helper'
-+require 'spec/spec_helper'
-
- require 'stringio'
- if defined?(Encoding)
---- a/spec/unpack_spec.rb
-+++ b/spec/unpack_spec.rb
-@@ -1,5 +1,5 @@
- # encoding: ascii-8bit
--require 'spec_helper'
-+require 'spec/spec_helper'
-
- require 'stringio'
- if defined?(Encoding)
---- a/spec/cruby/buffer_io_spec.rb
-+++ b/spec/cruby/buffer_io_spec.rb
-@@ -1,5 +1,5 @@
- require 'spec/spec_helper'
--require 'random_compat'
-+require 'spec/random_compat'
-
- require 'stringio'
- if defined?(Encoding)
---- a/spec/cruby/buffer_spec.rb
-+++ b/spec/cruby/buffer_spec.rb
-@@ -1,5 +1,5 @@
- require 'spec/spec_helper'
--require 'random_compat'
-+require 'spec/random_compat'
-
- describe Buffer do
- STATIC_EXAMPLES = {}
diff --git a/debian/patches/11_fix_test_patch.patch b/debian/patches/11_fix_test_patch.patch
deleted file mode 100644
index ca512c9..0000000
--- a/debian/patches/11_fix_test_patch.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: Jonas Genannt
-Description: fix include of spec helper files
-
---- a/spec/cruby/buffer_io_spec.rb
-+++ b/spec/cruby/buffer_io_spec.rb
-@@ -1,4 +1,4 @@
--require 'spec_helper'
-+require 'spec/spec_helper'
- require 'random_compat'
-
- require 'stringio'
---- a/spec/cruby/buffer_packer.rb
-+++ b/spec/cruby/buffer_packer.rb
-@@ -1,5 +1,5 @@
- # encoding: ascii-8bit
--require 'spec_helper'
-+require 'spec/spec_helper'
-
- require 'stringio'
- if defined?(Encoding)
---- a/spec/cruby/buffer_spec.rb
-+++ b/spec/cruby/buffer_spec.rb
-@@ -1,4 +1,4 @@
--require 'spec_helper'
-+require 'spec/spec_helper'
- require 'random_compat'
-
- describe Buffer do
---- a/spec/cruby/buffer_unpacker.rb
-+++ b/spec/cruby/buffer_unpacker.rb
-@@ -1,5 +1,5 @@
- # encoding: ascii-8bit
--require 'spec_helper'
-+require 'spec/spec_helper'
-
- describe Unpacker do
- let :unpacker do
---- a/spec/cruby/packer_spec.rb
-+++ b/spec/cruby/packer_spec.rb
-@@ -1,5 +1,5 @@
- # encoding: ascii-8bit
--require 'spec_helper'
-+require 'spec/spec_helper'
-
- require 'stringio'
- if defined?(Encoding)
---- a/spec/cruby/unpacker_spec.rb
-+++ b/spec/cruby/unpacker_spec.rb
-@@ -1,5 +1,5 @@
- # encoding: ascii-8bit
--require 'spec_helper'
-+require 'spec/spec_helper'
-
- describe Unpacker do
- let :unpacker do
diff --git a/debian/patches/series b/debian/patches/series
index 03e0654..f9db7b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-11_fix_test_patch.patch
-10_fix_test_path
+0001-Fix-paths-for-spec_helper-random_compat.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-msgpack.git
More information about the Pkg-ruby-extras-commits
mailing list