[DRE-commits] [SCM] yard.git branch, master, updated. upstream/0.7.4-44-g2e948b4

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 3abfc03b1c6b40519e38bffd244b468cab22fb68
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sun May 6 14:44:59 2012 +0200

    Use relative path in set-templates-path.patch

diff --git a/debian/patches/set-templates-path.patch b/debian/patches/set-templates-path.patch
index 3c91c1d..0d8193a 100644
--- a/debian/patches/set-templates-path.patch
+++ b/debian/patches/set-templates-path.patch
@@ -1,13 +1,15 @@
 Description: set templates path to /usr/share/yard/templates
+ Put a relative path instead of an absolute one makes also the tests happy
 Author: Lucas Nussbaum <lucas at debian.org>
-Last-Update: 2012-05-3
+Last-Update: 2012-05-03
 
 --- a/lib/yard/templates/engine.rb
 +++ b/lib/yard/templates/engine.rb
-@@ -174,5 +174,6 @@
+@@ -174,5 +174,7 @@
      end
  
      Engine.register_template_path(File.join(YARD::ROOT, '..', 'templates'))
-+    Engine.register_template_path('/usr/share/yard/templates')
++    # add /usr/share/yard/templates
++    Engine.register_template_path(File.join(YARD::ROOT, '../../../', 'share/yard/templates'))
    end
  end

-- 
yard.git