[DRE-commits] [SCM] ruby-ferret.git branch, master, updated. debian/0.11.6-3-21-g68f4ccc

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 25dabb05d019cf3d6b8e744233aedab23904bd44
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Jun 14 22:16:42 2012 +0200

    add block_variables_have_local_scopes.patch

diff --git a/debian/patches/block_variables_have_local_scopes.patch b/debian/patches/block_variables_have_local_scopes.patch
new file mode 100644
index 0000000..cd41c00
--- /dev/null
+++ b/debian/patches/block_variables_have_local_scopes.patch
@@ -0,0 +1,22 @@
+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/series b/debian/patches/series
index dee7ec6..14d3635 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@ 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

-- 
ruby-ferret.git