[DRE-commits] [yard] 02/05: * Refresh patches

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository yard.

commit ff1a36f82d77b399a228f350d529a7177489d39e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Aug 2 16:38:08 2016 +0200

    * Refresh patches
---
 debian/changelog                                         | 7 +++++++
 debian/patches/deactivate_failing_test_with_sbuild.patch | 8 ++++----
 debian/patches/fix_template_root_var.patch               | 9 ++++-----
 debian/patches/force_file_order.patch                    | 2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a99897e..c83b64d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+yard (0.9.5-1) UNRELEASED; urgency=medium
+
+  * Imported Upstream version 0.9.5
+  * Refresh patches
+
+ -- Cédric Boutillier <boutil at debian.org>  Tue, 02 Aug 2016 16:33:12 +0200
+
 yard (0.9.0-1) unstable; urgency=medium
 
   * Imported Upstream version 0.9.0
diff --git a/debian/patches/deactivate_failing_test_with_sbuild.patch b/debian/patches/deactivate_failing_test_with_sbuild.patch
index 7e6b7d4..a1d4aa3 100644
--- a/debian/patches/deactivate_failing_test_with_sbuild.patch
+++ b/debian/patches/deactivate_failing_test_with_sbuild.patch
@@ -1,16 +1,16 @@
 Description: deactivate one of the registry specs, failing with sbuild
 Origin: vendor
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674327
-Last-Update: 2016-02-20
+Last-Update: 2016-08-02
 
 --- a/spec/registry_spec.rb
 +++ b/spec/registry_spec.rb
-@@ -50,7 +50,7 @@
-       expect(Registry.yardoc_file_for_gem('foo', '>= 0', true)).to eq '/path/to/foo/.yardoc'
+@@ -74,7 +74,7 @@
+       expect(Registry.yardoc_file_for_gem('foo', '>= 0', true)).to eq '/path/to/foo/doc/.yardoc'
      end
  
 -    it "returns local .yardoc path for gem if for_writing=true and dir is not writable" do
 +    xit "returns local .yardoc path for gem if for_writing=true and dir is not writable" do
+       expect(File).to receive(:writable?).with(@gem.doc_dir).and_return(false)
        expect(File).to receive(:writable?).with(@gem.full_gem_path).and_return(false)
        expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-       expect(Registry.yardoc_file_for_gem('foo', '>= 0', true)).to match %r{/.yard/gem_index/foo-1.0.yardoc$}
diff --git a/debian/patches/fix_template_root_var.patch b/debian/patches/fix_template_root_var.patch
index d18311d..42f9f9b 100644
--- a/debian/patches/fix_template_root_var.patch
+++ b/debian/patches/fix_template_root_var.patch
@@ -2,12 +2,12 @@ Description: fix TEMPLATE_ROOT to take into account FHS
  set to ../templates if running the lib from the source tree
  and to /usr/share/yard/templates if running from the system lib
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-04-01
+Last-Update: 2016-08-02
 
 --- a/lib/yard.rb
 +++ b/lib/yard.rb
-@@ -5,7 +5,11 @@
-   ROOT = File.expand_path(File.dirname(__FILE__))
+@@ -6,7 +6,11 @@
+   require File.join(YARD::ROOT, 'yard', 'autoload')
  
    # The root path for YARD builtin templates
 -  TEMPLATE_ROOT = File.join(ROOT, '..', 'templates')
@@ -18,5 +18,4 @@ Last-Update: 2014-04-01
 +  end
  
    # @deprecated Use {Config::CONFIG_DIR}
-   CONFIG_DIR = File.expand_path('~/.yard')
-
+   CONFIG_DIR = Config::CONFIG_DIR
diff --git a/debian/patches/force_file_order.patch b/debian/patches/force_file_order.patch
index 3880f46..b9db108 100644
--- a/debian/patches/force_file_order.patch
+++ b/debian/patches/force_file_order.patch
@@ -3,7 +3,7 @@ Description: force sorting filenames when compiling list of files
  generate documentation.
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: https://github.com/lsegal/yard/pull/978
-Last-Update: 2016-03-16
+Last-Update: 2016-08-02
 
 --- a/lib/yard/cli/yardoc.rb
 +++ b/lib/yard/cli/yardoc.rb

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/yard.git