[DRE-commits] [SCM] ruby-ihelp.git branch, master, updated. upstream/0.4.5-11-gcc7a556

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit d9e6df75699c418904304ce79568810183dbac1e
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 29 16:54:57 2012 +0200

    Added patch add_ruby1.9.1_support.patch

diff --git a/debian/changelog b/debian/changelog
index d7121d0..9717622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,9 +17,10 @@ ruby-ihelp (0.4.5-3) UNRELEASED; urgency=low
     - Added libihelp-ruby and libihelp-ruby1.8 as transitional packages.
     - Added a recommend on ruby-ferret (needed for full text search).
   * debian/copyright: reworked to fit the Debian copyright format version 1.0.
-  * debian/patches: added remove_rubygems.patch.
+  * debian/patches: added remove_rubygems.patch and add_ruby1.9.1_support.patch.
   * debian/ruby-ihelp.docs: install the README and TODO files.
   * debian/ruby-ihelp.manpages: renamed file from libihelp-ruby1.8.manpages.
+  * 
 
  -- Paul van Tilburg <paulvt at debian.org>  Tue, 29 May 2012 16:10:22 +0200
 
diff --git a/debian/patches/add_ruby1.9.1_support.patch b/debian/patches/add_ruby1.9.1_support.patch
new file mode 100644
index 0000000..e08079d
--- /dev/null
+++ b/debian/patches/add_ruby1.9.1_support.patch
@@ -0,0 +1,18 @@
+Description: Add support for Ruby 1.9.x
+ The RI driver has a different name in Ruby 1.9.x.  This patch ensures
+ that the RI driver is loaded from the correct place.
+Author: Paul van Tilburg <paulvt at debian.org>
+Last-Update: 2012-05-29
+
+--- a/lib/ihelp.rb
++++ b/lib/ihelp.rb
+@@ -1,4 +1,8 @@
+-require 'rdoc/ri/ri_driver'
++if RUBY_VERSION =~ /^1\.9/
++  require 'rdoc/ri/driver'
++else
++  require 'rdoc/ri/ri_driver'
++end
+ require 'rexml/document'
+ begin
+   if $ihelp_full_text_search != false
diff --git a/debian/patches/remove_rubygems.patch b/debian/patches/remove_rubygems.patch
index ea9eff8..7ff6bb1 100644
--- a/debian/patches/remove_rubygems.patch
+++ b/debian/patches/remove_rubygems.patch
@@ -1,16 +1,25 @@
-Description: do not rely on rubygems to load libraries
-Author: Paul van Tilburg <paulvt at debian.org>j
+Description: Do not rely on rubygems to load libraries
+ Also replaced the suggestion to run `gem install ferret' by the suggestion
+ to install the ruby-ferret package to enable full text indexing.
+Author: Paul van Tilburg <paulvt at debian.org>
 Last-Update: 2012-05-29
 
 --- a/bin/ihelp_reindex.rb
 +++ b/bin/ihelp_reindex.rb
-@@ -1,6 +1,5 @@
+@@ -1,12 +1,11 @@
  #!/usr/bin/ruby
  
 -require 'rubygems'
  require 'ihelp'
  begin
    require 'ferret'
+ rescue Exception
+   STDERR.puts "Unable to load Ferret, can't update full text index."
+-  STDERR.puts "Try `gem install ferret' if you don't have already."
++  STDERR.puts "Please install the 'ruby-ferret' to enable this feature."
+   exit 1
+ end
+ 
 --- a/lib/ihelp.rb
 +++ b/lib/ihelp.rb
 @@ -2,7 +2,6 @@
diff --git a/debian/patches/series b/debian/patches/series
index 9568fa6..16d9634 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove_rubygems.patch
+add_ruby1.9.1_support.patch

-- 
ruby-ihelp.git