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

[Martin Ueding]

The following commit has been merged in the master branch:
commit dcddb1ed7f31afb48a40da4499ffd96fcc05b752
Author: Martin Ueding <dev at martin-ueding.de>
Date:   Mon Oct 10 20:08:38 2011 +0200

    Changed path of test require

diff --git a/debian/patches/test-pwd b/debian/patches/test-pwd
index d053a63..d694905 100644
--- a/debian/patches/test-pwd
+++ b/debian/patches/test-pwd
@@ -16,7 +16,7 @@ index 7b2bebd..1f72888 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class Comments < Mustache
    self.path = File.dirname(__FILE__)
@@ -27,7 +27,7 @@ index 99d5c46..2c689f9 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class ComplexView < Mustache
    self.path = File.dirname(__FILE__)
@@ -38,7 +38,7 @@ index 36574ff..b959dd3 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class CrazyRecursive < Mustache
    self.path = File.dirname(__FILE__)
@@ -49,7 +49,7 @@ index 884b098..c63c037 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class Delimiters < Mustache
    self.path = File.dirname(__FILE__)
@@ -60,7 +60,7 @@ index 1bafb01..177daa2 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class DotNotation < Mustache
    self.path = File.dirname(__FILE__)
@@ -71,7 +71,7 @@ index d46d8c9..94c9caf 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class DoubleSection < Mustache
    self.path = File.dirname(__FILE__)
@@ -82,7 +82,7 @@ index d3b3010..7bff2df 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class Escaped < Mustache
    self.path = File.dirname(__FILE__)
@@ -93,7 +93,7 @@ index de57909..a1ecb45 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class InvertedSection < Mustache
    self.path = File.dirname(__FILE__)
@@ -104,7 +104,7 @@ index 930cdce..d263cff 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class Lambda < Mustache
    self.path = File.dirname(__FILE__)
@@ -115,7 +115,7 @@ index 6d27d8f..927e3c3 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class MethodMissing < Mustache
    self.template = '[ {{#list}}{{.}} {{/list}}]'
@@ -126,7 +126,7 @@ index 742f325..eff91cf 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  module TestViews
    class Namespaced < Mustache
@@ -137,7 +137,7 @@ index dd5afb2..52ae8f8 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  require 'ostruct'
  
  class NestedObjects < Mustache
@@ -148,7 +148,7 @@ index 511ab75..8c5ccdc 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  module SimpleView
    def name
@@ -159,7 +159,7 @@ index 79312a8..4fd2a85 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class Passenger < Mustache
    self.path = File.dirname(__FILE__)
@@ -170,7 +170,7 @@ index 595d0c6..e60f202 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class Recursive < Mustache
    self.path = File.dirname(__FILE__)
@@ -181,7 +181,7 @@ index 8072466..9dff28d 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class Simple < Mustache
    self.path = File.dirname(__FILE__)
@@ -192,7 +192,7 @@ index c2d460e..22d4396 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class TemplatePartial < Mustache
    self.path = File.dirname(__FILE__)
@@ -203,7 +203,7 @@ index 538ada8..35af53b 100644
 @@ -1,5 +1,5 @@
  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  
  class Unescaped < Mustache
    self.path = File.dirname(__FILE__)
@@ -213,7 +213,7 @@ index d20263e..bd42e78 100644
 +++ b/test/spec_test.rb
 @@ -1,4 +1,4 @@
 -require 'mustache'
-+require '../bin/mustache'
++require 'lib/mustache'
  require 'tmpdir'
  require 'yaml'
  require 'test/unit'

-- 
ruby-mustache.git