[DRE-commits] [SCM] ruby-magic.git branch, master, updated. upstream/0.2.6-4-gd044701

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit d044701907bce1ec24b4cece524daf122e6c52cb
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Sat Sep 17 16:20:51 2011 +0300

    patch: remove rubygems usage, require test_declarative

diff --git a/debian/changelog b/debian/changelog
index 830f139..428884d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ruby-magic (0.2.6-1) unstable; urgency=low
 
   * Initial release (Closes: #629136)
+  * Unit test patched not to use rubygems and to require test_declarative.
 
  -- Dmitry Borodaenko <angdraug at debian.org>  Sat, 17 Sep 2011 15:36:57 +0300
diff --git a/debian/patches/0001-remove-rubygems-usage-require-test_declarative.patch b/debian/patches/0001-remove-rubygems-usage-require-test_declarative.patch
new file mode 100644
index 0000000..deaf84e
--- /dev/null
+++ b/debian/patches/0001-remove-rubygems-usage-require-test_declarative.patch
@@ -0,0 +1,21 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Sat, 17 Sep 2011 16:20:22 +0300
+Subject: remove rubygems usage, require test_declarative
+
+---
+ test/helper.rb |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/test/helper.rb b/test/helper.rb
+index f8e992f..1dccf12 100644
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -1,6 +1,5 @@
+-require "rubygems"
+-gem "test-unit"
+ require "test/unit"
++require "test_declarative"
+ 
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+ $LOAD_PATH.unshift(File.dirname(__FILE__))
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7e9dc02
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-remove-rubygems-usage-require-test_declarative.patch

-- 
ruby-magic.git