[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 2986f3ea015040a364d9b5d64c4ceb970d27db74
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 29 17:05:53 2012 +0200

    Remove Ruby 1.9.1 support; the RI driver API is to different

diff --git a/debian/changelog b/debian/changelog
index 9717622..19d1eab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 ruby-ihelp (0.4.5-3) UNRELEASED; urgency=low
 
   * Source packages adapted according to the new Ruby policy:
-    - Build for both ruby1.8 and ruby1.9.1.
+    - Build for ruby1.8 only; the ruby1.9.1 RI driver API is too different.
     - Migrated to pkg-ruby-extras git repos. Changed the Vcs-* fields in
       debian/control accordingly.
     - Changed the depends and recommends to follow the new Ruby
@@ -9,7 +9,7 @@ ruby-ihelp (0.4.5-3) UNRELEASED; urgency=low
   * debian/control:
     - Added a default DM-Upload-Allowed field set to yes.
     - Standards-Version bumped to 3.9.3; no changes required.
-    - Set XS-Ruby-Versions to all.
+    - Set XS-Ruby-Versions to ruby1.8.
     - Added the homepage.
     - Changed the build-depends for using gem2deb instead of ruby-pkg-tools.
     - Switched the maintainer with the uploaders field as per new
@@ -17,10 +17,9 @@ 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 and add_ruby1.9.1_support.patch.
+  * 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.
-  * 
 
  -- Paul van Tilburg <paulvt at debian.org>  Tue, 29 May 2012 16:10:22 +0200
 
diff --git a/debian/control b/debian/control
index e346891..730e1f5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-ihelp.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-ihelp.git;a=summary
 Homepage: http://rubyforge.org/projects/ihelp
-XS-Ruby-Versions: all
+XS-Ruby-Versions: ruby1.8
 
 Package: ruby-ihelp
 Architecture: all
diff --git a/debian/patches/add_ruby1.9.1_support.patch b/debian/patches/add_ruby1.9.1_support.patch
deleted file mode 100644
index e08079d..0000000
--- a/debian/patches/add_ruby1.9.1_support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/series b/debian/patches/series
index 16d9634..9568fa6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 remove_rubygems.patch
-add_ruby1.9.1_support.patch

-- 
ruby-ihelp.git