Subject: Collected Debian patches for roodi
Author: David Suarez <david.sephirot@gmail.com>

The roodi package is maintained in Git rather than maintaining
patches as separate files, and separating the patches doesn't seem to
be worth the effort.  They are therefore all included in this single
Debian patch.

For full commit history and separated commits, see the packaging Git
repository.

--- roodi-2.2.0.orig/Gemfile
+++ roodi-2.2.0/Gemfile
@@ -3,4 +3,4 @@ source :rubygems
 gemspec
 
 gem "rake"
-gem "rspec", "~> 1.3.2"
+gem "rspec", "~> 2.13.0"
--- roodi-2.2.0.orig/Gemfile.lock
+++ roodi-2.2.0/Gemfile.lock
@@ -7,8 +7,16 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.2.4)
     rake (10.0.3)
-    rspec (1.3.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
     ruby_parser (2.3.0)
       sexp_processor (~> 3.0)
     sexp_processor (3.2.0)
@@ -19,4 +27,4 @@ PLATFORMS
 DEPENDENCIES
   rake
   roodi!
-  rspec (~> 1.3.2)
+  rspec (~> 2.13.0)
--- roodi-2.2.0.orig/Rakefile
+++ roodi-2.2.0/Rakefile
@@ -1,5 +1,5 @@
 require 'rake'
-require 'spec/rake/spectask'
+require "rspec/core/rake_task"
 require 'bundler'
 require 'roodi'
 
@@ -13,8 +13,8 @@ def roodi(ruby_files)
 end
 
 desc "Run all specs"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*spec.rb']
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.pattern = FileList['spec/**/*spec.rb']
 end
 
 desc "Run Roodi against all source files"
--- roodi-2.2.0.orig/bin/roodi
+++ roodi-2.2.0/bin/roodi
@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
-
 require 'roodi'
 
 runner = Roodi::Core::Runner.new
--- roodi-2.2.0.orig/bin/roodi-describe
+++ roodi-2.2.0/bin/roodi-describe
@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'roodi'
 
 roodi = Roodi::Core::Runner.new
--- roodi-2.2.0.orig/lib/roodi/core/parser.rb
+++ roodi-2.2.0/lib/roodi/core/parser.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'ruby_parser'
 
 module Roodi
--- roodi-2.2.0.orig/lib/roodi/core/runner.rb
+++ roodi-2.2.0/lib/roodi/core/runner.rb
@@ -8,7 +8,7 @@ require 'roodi/core/visitable_sexp'
 module Roodi
   module Core
     class Runner
-      DEFAULT_CONFIG = File.join(File.dirname(__FILE__), "..", "..", "..", "roodi.yml")
+      DEFAULT_CONFIG = "/etc/roodi.yml"
       
       attr_writer :config
       
--- roodi-2.2.0.orig/lib/roodi/core/visitable_sexp.rb
+++ roodi-2.2.0/lib/roodi/core/visitable_sexp.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'sexp'
 
 class Sexp
--- roodi-2.2.0.orig/spec/spec_helper.rb
+++ roodi-2.2.0/spec/spec_helper.rb
@@ -1,3 +1,3 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'roodi'
-require 'spec'
+require 'rspec'
