[DRE-commits] [SCM] ruby-roxml.git branch, master, updated. upstream/3.3.1-15-g8375e9a

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit affab0ba35033885402c366ab6012ca3a46a91f6
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Apr 18 17:41:49 2013 +0200

    add remove_rubygems_from_tests.patch and use_moved_VERSION.patch

diff --git a/debian/patches/remove_rubygems_from_tests.patch b/debian/patches/remove_rubygems_from_tests.patch
new file mode 100644
index 0000000..f0bf312
--- /dev/null
+++ b/debian/patches/remove_rubygems_from_tests.patch
@@ -0,0 +1,27 @@
+Description: do not require explicitly rubygems in tests
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: no
+Last-Update: 2013-04-18
+
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,5 +1,4 @@
+ require 'ostruct'
+-require 'rubygems'
+ require 'pathname'
+ require 'ostruct'
+ require 'roxml'
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'active_support/test_case'
+ require_relative './mocks/mocks'
+ require_relative './mocks/dictionaries'
+@@ -31,4 +30,4 @@
+     end
+   end
+   xml
+-end
+\ No newline at end of file
++end
diff --git a/debian/patches/series b/debian/patches/series
index 56d0306..f1b567b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 require-system-roxml.patch
 require-rspec.patch
+use_moved_VERSION.patch
+remove_rubygems_from_tests.patch
diff --git a/debian/patches/use_moved_VERSION.patch b/debian/patches/use_moved_VERSION.patch
new file mode 100644
index 0000000..2aa676a
--- /dev/null
+++ b/debian/patches/use_moved_VERSION.patch
@@ -0,0 +1,18 @@
+Description: use moved version of VERSION file
+ VERSION file is moved from the root of the source package to lib/roxml
+ The relative path of VERSION should be adapted in roxml.rb file
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2013-04-18
+Forwarded: no
+
+--- a/lib/roxml.rb
++++ b/lib/roxml.rb
+@@ -14,7 +14,7 @@
+ require 'roxml/xml'
+ 
+ module ROXML # :nodoc:
+-  VERSION = File.read(File.expand_path("../../VERSION", __FILE__))
++  VERSION = File.read(File.expand_path("../roxml/VERSION", __FILE__))
+ 
+   def self.included(base) # :nodoc:
+     base.class_eval do

-- 
ruby-roxml.git