[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 c08bfb5e88787df31fd5d0f3e6b7a68c125aff53
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 29 16:30:24 2012 +0200

    Added remove_rubygems.patch

diff --git a/debian/changelog b/debian/changelog
index 7c23175..681c831 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ ruby-ihelp (0.4.5-3) UNRELEASED; urgency=low
       convention the team is the default maintainer.
     - Added libihelp-ruby and libihelp-ruby1.8 as transitional packages.
   * debian/copyright: reworked to fit the Debian copyright format version 1.0.
+  * debian/patches: added remove_rubygems.patch.
   * debian/ruby-ihelp.docs: install the README and TODO files.
   * debian/ruby-ihelp.manpages: renamed file from libihelp-ruby1.8.manpages.
 
diff --git a/debian/patches/remove_rubygems.patch b/debian/patches/remove_rubygems.patch
new file mode 100644
index 0000000..ea9eff8
--- /dev/null
+++ b/debian/patches/remove_rubygems.patch
@@ -0,0 +1,23 @@
+Description: do not rely on rubygems to load libraries
+Author: Paul van Tilburg <paulvt at debian.org>j
+Last-Update: 2012-05-29
+
+--- a/bin/ihelp_reindex.rb
++++ b/bin/ihelp_reindex.rb
+@@ -1,6 +1,5 @@
+ #!/usr/bin/ruby
+ 
+-require 'rubygems'
+ require 'ihelp'
+ begin
+   require 'ferret'
+--- a/lib/ihelp.rb
++++ b/lib/ihelp.rb
+@@ -2,7 +2,6 @@
+ require 'rexml/document'
+ begin
+   if $ihelp_full_text_search != false
+-    require 'rubygems'
+     require 'ferret'
+     require 'stringio'
+     require 'fileutils'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9568fa6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove_rubygems.patch

-- 
ruby-ihelp.git