[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 5279a3389970265d3c627029790be65675d8e9e3
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Apr 18 17:38:45 2013 +0200

    extend require-system-roxml.patch; add DEP-3 headers to require-{system-roxml,rspec}.patch

diff --git a/debian/patches/require-rspec.patch b/debian/patches/require-rspec.patch
index d510be7..387f0a3 100644
--- a/debian/patches/require-rspec.patch
+++ b/debian/patches/require-rspec.patch
@@ -1,3 +1,8 @@
+Description: add missing requirement to rspec library
+Author: Praveen Arimbrathodiyil <praveen at debian.org>
+Forwarded: no
+Last-Update: 2013-04-18
+
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -3,6 +3,7 @@
diff --git a/debian/patches/require-system-roxml.patch b/debian/patches/require-system-roxml.patch
index 1904b97..2e2a571 100644
--- a/debian/patches/require-system-roxml.patch
+++ b/debian/patches/require-system-roxml.patch
@@ -1,3 +1,10 @@
+Description: use system path for roxml library
+ The version that should be used is the one in the debian/ directory,
+ not the one in the lib/ dir of the source package
+Author: Praveen Arimbrathodiyil <praveen at debian.org>
+Forwarded: no
+Last-Update: 2013-04-18
+
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -2,9 +2,9 @@
@@ -11,3 +18,33 @@
  require_relative './shared_specs'
  
  def xml_for(name)
+--- a/test/mocks/dictionaries.rb
++++ b/test/mocks/dictionaries.rb
+@@ -1,4 +1,4 @@
+-require_relative "./../../lib/roxml"
++require "roxml"
+ 
+ class DictionaryOfAttrs
+   include ROXML
+@@ -54,4 +54,4 @@
+   xml_name :dictionary
+   xml_reader :definitions, :as => {:key => '@name',
+                             :value => 'content'}, :from => :definition
+-end
+\ No newline at end of file
++end
+--- a/test/mocks/mocks.rb
++++ b/test/mocks/mocks.rb
+@@ -1,4 +1,4 @@
+-require_relative "./../../lib/roxml"
++require "roxml"
+ 
+ class Muffins
+   include ROXML
+@@ -276,4 +276,4 @@
+   xml_reader :age, :from => :attr, :else => 21
+   xml_reader :name, :else => 'Anonymous'
+   xml_reader :mother,:as => PersonWithMotherOrMissing, :else => Person.blank
+-end
+\ No newline at end of file
++end

-- 
ruby-roxml.git