[DRE-commits] [SCM] ruby-mustache.git branch, master, updated. upstream/0.99.4-16-gc669b0f

[Martin Ueding]

The following commit has been merged in the master branch:
commit c669b0ff736bd4c33626ce77e41eaf047f4f53cf
Author: Martin Ueding <dev at martin-ueding.de>
Date:   Tue Oct 11 14:08:26 2011 +0200

    Remove test-pwd patch for good

diff --git a/debian/patches/series b/debian/patches/series
index d2c0531..28481ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-encoding
-#//test-pwd
diff --git a/debian/patches/test-pwd b/debian/patches/test-pwd
deleted file mode 100644
index d694905..0000000
--- a/debian/patches/test-pwd
+++ /dev/null
@@ -1,219 +0,0 @@
-Description: Make tests runnable from main dir
- The tests had to be run from the bin folder. Since debuild runs them from the
- main directory, I changed the require paths.
-
----
-
-Origin: vendor
-Forwarded: no
-Reviewed-By: Martin Ueding <dev at martin-ueding.de>
-Last-Update: 2011-10-08
-
-diff --git a/test/fixtures/comments.rb b/test/fixtures/comments.rb
-index 7b2bebd..1f72888 100644
---- a/test/fixtures/comments.rb
-+++ b/test/fixtures/comments.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class Comments < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/complex_view.rb b/test/fixtures/complex_view.rb
-index 99d5c46..2c689f9 100644
---- a/test/fixtures/complex_view.rb
-+++ b/test/fixtures/complex_view.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class ComplexView < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/crazy_recursive.rb b/test/fixtures/crazy_recursive.rb
-index 36574ff..b959dd3 100644
---- a/test/fixtures/crazy_recursive.rb
-+++ b/test/fixtures/crazy_recursive.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class CrazyRecursive < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/delimiters.rb b/test/fixtures/delimiters.rb
-index 884b098..c63c037 100644
---- a/test/fixtures/delimiters.rb
-+++ b/test/fixtures/delimiters.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class Delimiters < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/dot_notation.rb b/test/fixtures/dot_notation.rb
-index 1bafb01..177daa2 100644
---- a/test/fixtures/dot_notation.rb
-+++ b/test/fixtures/dot_notation.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class DotNotation < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/double_section.rb b/test/fixtures/double_section.rb
-index d46d8c9..94c9caf 100644
---- a/test/fixtures/double_section.rb
-+++ b/test/fixtures/double_section.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class DoubleSection < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/escaped.rb b/test/fixtures/escaped.rb
-index d3b3010..7bff2df 100644
---- a/test/fixtures/escaped.rb
-+++ b/test/fixtures/escaped.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class Escaped < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/inverted_section.rb b/test/fixtures/inverted_section.rb
-index de57909..a1ecb45 100644
---- a/test/fixtures/inverted_section.rb
-+++ b/test/fixtures/inverted_section.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class InvertedSection < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/lambda.rb b/test/fixtures/lambda.rb
-index 930cdce..d263cff 100644
---- a/test/fixtures/lambda.rb
-+++ b/test/fixtures/lambda.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class Lambda < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/method_missing.rb b/test/fixtures/method_missing.rb
-index 6d27d8f..927e3c3 100644
---- a/test/fixtures/method_missing.rb
-+++ b/test/fixtures/method_missing.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class MethodMissing < Mustache
-   self.template = '[ {{#list}}{{.}} {{/list}}]'
-diff --git a/test/fixtures/namespaced.rb b/test/fixtures/namespaced.rb
-index 742f325..eff91cf 100644
---- a/test/fixtures/namespaced.rb
-+++ b/test/fixtures/namespaced.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- module TestViews
-   class Namespaced < Mustache
-diff --git a/test/fixtures/nested_objects.rb b/test/fixtures/nested_objects.rb
-index dd5afb2..52ae8f8 100644
---- a/test/fixtures/nested_objects.rb
-+++ b/test/fixtures/nested_objects.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- require 'ostruct'
- 
- class NestedObjects < Mustache
-diff --git a/test/fixtures/partial_with_module.rb b/test/fixtures/partial_with_module.rb
-index 511ab75..8c5ccdc 100644
---- a/test/fixtures/partial_with_module.rb
-+++ b/test/fixtures/partial_with_module.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- module SimpleView
-   def name
-diff --git a/test/fixtures/passenger.rb b/test/fixtures/passenger.rb
-index 79312a8..4fd2a85 100644
---- a/test/fixtures/passenger.rb
-+++ b/test/fixtures/passenger.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class Passenger < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/recursive.rb b/test/fixtures/recursive.rb
-index 595d0c6..e60f202 100644
---- a/test/fixtures/recursive.rb
-+++ b/test/fixtures/recursive.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class Recursive < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/simple.rb b/test/fixtures/simple.rb
-index 8072466..9dff28d 100644
---- a/test/fixtures/simple.rb
-+++ b/test/fixtures/simple.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class Simple < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/template_partial.rb b/test/fixtures/template_partial.rb
-index c2d460e..22d4396 100644
---- a/test/fixtures/template_partial.rb
-+++ b/test/fixtures/template_partial.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class TemplatePartial < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/fixtures/unescaped.rb b/test/fixtures/unescaped.rb
-index 538ada8..35af53b 100644
---- a/test/fixtures/unescaped.rb
-+++ b/test/fixtures/unescaped.rb
-@@ -1,5 +1,5 @@
- $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
--require 'mustache'
-+require 'lib/mustache'
- 
- class Unescaped < Mustache
-   self.path = File.dirname(__FILE__)
-diff --git a/test/spec_test.rb b/test/spec_test.rb
-index d20263e..bd42e78 100644
---- a/test/spec_test.rb
-+++ b/test/spec_test.rb
-@@ -1,4 +1,4 @@
--require 'mustache'
-+require 'lib/mustache'
- require 'tmpdir'
- require 'yaml'
- require 'test/unit'

-- 
ruby-mustache.git