[DRE-commits] [ruby-ferret] 06/12: drop fix_compatibility_with_minitest.patch and block_variables_have_local_scopes.patch (applied upstream)

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-ferret.

commit 56d1966bdfcb5eed81096316f2909c130c79af10
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Nov 25 00:02:07 2013 +0100

    drop fix_compatibility_with_minitest.patch and block_variables_have_local_scopes.patch (applied upstream)
---
 debian/changelog                                   |  2 ++
 .../block_variables_have_local_scopes.patch        | 22 ----------------------
 .../patches/fix_compatibility_with_minitest.patch  | 20 --------------------
 debian/patches/series                              |  2 --
 4 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0534343..73d35e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ruby-ferret (0.11.8.5-1) UNRELEASED; urgency=low
     + bump Standards-Version to 3.9.5 (no changes needed)
     + drop transitional packages
   * Remove single-debian-patch option
+  * Drop fix_compatibility_with_minitest.patch and
+    block_variables_have_local_scopes.patch (applied upstream)
 
  -- Cédric Boutillier <boutil at debian.org>  Sun, 24 Nov 2013 22:39:29 +0100
 
diff --git a/debian/patches/block_variables_have_local_scopes.patch b/debian/patches/block_variables_have_local_scopes.patch
deleted file mode 100644
index cd41c00..0000000
--- a/debian/patches/block_variables_have_local_scopes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Block variables have local scopes.
- Fix bin/ferret-browser to be compatible with Ruby 1.9.
-Author: Vít Ondruch <v.ondruch at tiscali.cz>
-Bug: https://github.com/jkraemer/ferret/pull/6
-Origin: https://github.com/jkraemer/ferret/commit/a17d8fc314ebf673a1e7aacda5efd3e6f8724df4
-Last-Update: 2012-05-16
----
-
---- a/bin/ferret-browser
-+++ b/bin/ferret-browser
-@@ -16,9 +16,9 @@
-   opts.separator "Specific Options:"
- 
-   opts.on("-h", "--host HOSTNAME",
--          "Host for web server to bind to (default is all IPs)") { |conf.host| }
-+          "Host for web server to bind to (default is all IPs)") { |host| conf.host = host }
-   opts.on("-p", "--port NUM",
--          "Port for web server (defaults to #{conf.port})") { |conf.port| }
-+          "Port for web server (defaults to #{conf.port})") { |port| conf.port = port }
-   opts.on("-s", "--server NAME",
-           "Server to force (#{SERVER_OPTIONS.join(', ')}).") { |s| conf.server = s.to_sym }
- 
diff --git a/debian/patches/fix_compatibility_with_minitest.patch b/debian/patches/fix_compatibility_with_minitest.patch
deleted file mode 100644
index 71699c9..0000000
--- a/debian/patches/fix_compatibility_with_minitest.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix compatibily with minitest.
-Author: Vít Ondruch <v.ondruch at tiscali.cz>
-Origin: https://github.com/jkraemer/ferret/commit/62f469375e4c077f00f4bd90cc60362a45c0f8b5
-Bug: https://github.com/jkraemer/ferret/pull/3
-Last-Update: 2012-05-15
-
----
- ruby/test/unit/tc_field_symbol.rb |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/test/unit/tc_field_symbol.rb
-+++ b/test/unit/tc_field_symbol.rb
-@@ -21,6 +21,6 @@
-       assert_equal(field_type, :sym.__send__(field_type).type)
-     end
- 
--    assert(:string, :sym.integer.byte.float.string.type)
-+    assert(:string, :sym.integer.byte.float.string.type.to_s)
-   end
- end
diff --git a/debian/patches/series b/debian/patches/series
index 14d3635..12c770a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-fix_compatibility_with_minitest.patch
 disable_test_causing_segfault.patch
 disable_load_path_manipulation.patch
 use_system_bzlib.patch
-block_variables_have_local_scopes.patch
 fix_typos_in_source_code.patch

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