[DRE-commits] [SCM] ruby-introspection.git branch, master, updated. upstream/0.0.2-7-g8553961

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit c99b6334848fef0d5a120d1e8c21060fb1ff8a53
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Dec 30 16:19:51 2011 +0100

    fix relative path of test_helper in requirements

diff --git a/debian/changelog b/debian/changelog
index 15ef479..f0b486a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ruby-introspection (0.0.2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #nnnn)
   * debian/patches/0100_remove_rubygems_bundler_stuff.patch: remove
-    requirements on rubygems and bundler Ruby libraries.
+    requirements on rubygems and bundler Ruby libraries
+  * debian/patches/0200_fix_path_in_require.patch: fix relative path of
+    test_helper.rb in require statements of tests
 
- -- Cédric Boutillier <cedric.boutillier at gmail.com>  Fri, 30 Dec 2011 16:05:19 +0100
+ -- Cédric Boutillier <cedric.boutillier at gmail.com>  Fri, 30 Dec 2011 16:14:56 +0100
diff --git a/debian/patches/0200_fix_path_in_require.patch b/debian/patches/0200_fix_path_in_require.patch
new file mode 100644
index 0000000..6f981da
--- /dev/null
+++ b/debian/patches/0200_fix_path_in_require.patch
@@ -0,0 +1,73 @@
+Description: Fix relative path for test_helper in require statements
+ As test/ is not in $LOAD_PATH, use "test/test_helper" in require statements
+ instead of just "test_helper".
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Forwarded: no
+Index: ruby-introspection/test/instance_snapshot_test.rb
+===================================================================
+--- ruby-introspection.orig/test/instance_snapshot_test.rb	2011-12-30 16:14:51.000000000 +0100
++++ ruby-introspection/test/instance_snapshot_test.rb	2011-12-30 16:14:51.000000000 +0100
+@@ -1,4 +1,4 @@
+-require "test_helper"
++require "test/test_helper"
+ 
+ class InstanceSnapshotTest < Test::Unit::TestCase
+ 
+@@ -119,4 +119,4 @@
+     end
+   end
+ 
+-end
+\ No newline at end of file
++end
+Index: ruby-introspection/test/class_snapshot_test.rb
+===================================================================
+--- ruby-introspection.orig/test/class_snapshot_test.rb	2011-12-30 16:14:51.000000000 +0100
++++ ruby-introspection/test/class_snapshot_test.rb	2011-12-30 16:14:51.000000000 +0100
+@@ -1,4 +1,4 @@
+-require "test_helper"
++require "test/test_helper"
+ 
+ class ClassSnapshotTest < Test::Unit::TestCase
+ 
+@@ -84,4 +84,4 @@
+     end
+   end
+ 
+-end
+\ No newline at end of file
++end
+Index: ruby-introspection/test/module_snapshot_test.rb
+===================================================================
+--- ruby-introspection.orig/test/module_snapshot_test.rb	2011-12-30 16:14:51.000000000 +0100
++++ ruby-introspection/test/module_snapshot_test.rb	2011-12-30 16:14:51.000000000 +0100
+@@ -1,4 +1,4 @@
+-require "test_helper"
++require "test/test_helper"
+ 
+ class ModuleSnapshotTest < Test::Unit::TestCase
+ 
+@@ -37,4 +37,4 @@
+       assert_method_exists(mod, superdupermod, :foo, visibility)
+     end
+   end
+-end
+\ No newline at end of file
++end
+Index: ruby-introspection/test/snapshot_test.rb
+===================================================================
+--- ruby-introspection.orig/test/snapshot_test.rb	2011-12-30 16:14:51.000000000 +0100
++++ ruby-introspection/test/snapshot_test.rb	2011-12-30 16:14:51.000000000 +0100
+@@ -1,4 +1,4 @@
+-require "test_helper"
++require "test/test_helper"
+ require "blankslate"
+ 
+ class SnapshotTest < Test::Unit::TestCase
+@@ -52,4 +52,4 @@
+     assert_nothing_raised { Snapshot.new(BlankSlate.new) }
+   end
+ 
+-end
+\ No newline at end of file
++end
diff --git a/debian/patches/series b/debian/patches/series
index d1af466..2dc38aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0100_remove_rubygems_bundler_stuff.patch
+0200_fix_path_in_require.patch

-- 
ruby-introspection.git