[DRE-commits] [SCM] ruby-addressable.git branch, master, updated. debian/2.2.8-1-10-geffcf7f

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 1406d09e6dd9083d6840148731c73d4857697c15
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Jun 4 21:54:51 2013 +0200

    fix spec to use installed library in debian/

diff --git a/debian/patches/remove_lib_from_loadpath.patch b/debian/patches/remove_lib_from_loadpath.patch
new file mode 100644
index 0000000..bcad610
--- /dev/null
+++ b/debian/patches/remove_lib_from_loadpath.patch
@@ -0,0 +1,18 @@
+Description: remove lib/ from loadpath in spec using unicode.data
+ so that it picks up the installed version of the library in debian/ with
+ unicode.data at the right place.
+ in complement to move_unicode_data.patch
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: no
+Last-Update: 2013-06-04
+
+--- a/spec/addressable/idna_spec.rb
++++ b/spec/addressable/idna_spec.rb
+@@ -17,6 +17,7 @@
+ # Have to use RubyGems to load the idn gem.
+ #require "rubygems"
+ 
++$:.delete File.expand_path("../../../lib", __FILE__)
+ require "addressable/idna"
+ 
+ shared_examples_for "converting from unicode to ASCII" do
diff --git a/debian/patches/series b/debian/patches/series
index 6ffe50f..42a2668 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove_rubygems_stuff.patch
 move_unicode_data.patch
+remove_lib_from_loadpath.patch

-- 
ruby-addressable.git