[DRE-commits] [yard] 05/13: Install as gem

Antonio Terceiro terceiro at moszumanska.debian.org
Fri Jan 13 09:54:04 UTC 2017 

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

terceiro pushed a commit to branch master
in repository yard.

commit 73fa06f2402a3fdc90187bbd92ac6c6bcd3af6fa
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jan 10 18:03:07 2017 -0200

    Install as gem
---
 debian/changelog                                   |   2 +
 .../deactivate_failing_test_with_sbuild.patch      |  16 ---
 debian/patches/fix_template_root_var.patch         |  21 ----
 debian/patches/force_file_order.patch              |  28 -----
 .../patches/move_yard_config_to_tmp_in_spec.patch  |  38 ------
 debian/patches/privacy-breach.patch                |   6 +-
 debian/patches/relax_specs_for_0_9_5.patch         | 135 ---------------------
 ..._rubygems_and_path_manipulation_from_spec.patch |  34 ------
 debian/patches/require-in-executables.patch        |  65 ----------
 debian/patches/rubygems_plugin_specs.patch         |  20 ---
 debian/patches/series                              |   9 --
 debian/patches/set-templates-path.patch            |  15 ---
 debian/rules                                       |   9 +-
 13 files changed, 7 insertions(+), 391 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f42fba0..0de65e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ yard (0.9.7-1) unstable; urgency=medium
   * New upstream release. Includes change to make the output reproducible
     (Closes: #849972)
   * debian/rules, debian/ruby-tests.rake: refreshed with `dh-make-ruby -w`
+  * debian/rules: install using the Rubygems layout. This makes most of the
+    patches we have been carrying here obsolete.
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 10 Jan 2017 17:47:20 -0200
 
diff --git a/debian/patches/deactivate_failing_test_with_sbuild.patch b/debian/patches/deactivate_failing_test_with_sbuild.patch
deleted file mode 100644
index 0d5ba4c..0000000
--- a/debian/patches/deactivate_failing_test_with_sbuild.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-08-02
-
---- a/spec/registry_spec.rb
-+++ b/spec/registry_spec.rb
-@@ -76,7 +76,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
-       allow(File).to receive(:writable?).with(@gem.doc_dir).and_return(false)
-       allow(File).to receive(:writable?).with(@gem.full_gem_path).and_return(false)
-       allow(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
diff --git a/debian/patches/fix_template_root_var.patch b/debian/patches/fix_template_root_var.patch
deleted file mode 100644
index 42f9f9b..0000000
--- a/debian/patches/fix_template_root_var.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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: 2016-08-02
-
---- a/lib/yard.rb
-+++ b/lib/yard.rb
-@@ -6,7 +6,11 @@
-   require File.join(YARD::ROOT, 'yard', 'autoload')
- 
-   # The root path for YARD builtin templates
--  TEMPLATE_ROOT = File.join(ROOT, '..', 'templates')
-+  if Dir.exists? File.expand_path('../../debian', __FILE__)
-+    TEMPLATE_ROOT = File.join(ROOT, '..', 'templates')
-+  else
-+    TEMPLATE_ROOT = "/usr/share/yard/templates/"
-+  end
- 
-   # @deprecated Use {Config::CONFIG_DIR}
-   CONFIG_DIR = Config::CONFIG_DIR
diff --git a/debian/patches/force_file_order.patch b/debian/patches/force_file_order.patch
deleted file mode 100644
index 6d8b2d0..0000000
--- a/debian/patches/force_file_order.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: force sorting filenames when compiling list of files
- This should help with reproducibility issues for packaging using yard to
- generate documentation.
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: https://github.com/lsegal/yard/pull/978
-Last-Update: 2016-08-02
-
---- a/lib/yard/cli/yardoc.rb
-+++ b/lib/yard/cli/yardoc.rb
-@@ -285,8 +285,8 @@
-         # Last minute modifications
-         self.files = Parser::SourceParser::DEFAULT_PATH_GLOB if self.files.empty?
-         self.files.delete_if {|x| x =~ /\A\s*\Z/ } # remove empty ones
--        readme = Dir.glob('README{,*[^~]}').first
--        readme ||= Dir.glob(files.first).first if options.onefile
-+        readme = Dir.glob('README{,*[^~]}').sort.first
-+        readme ||= Dir.glob(files.first).sort.first if options.onefile
-         options.readme ||= CodeObjects::ExtraFileObject.new(readme) if readme
-         options.files.unshift(options.readme).uniq! if options.readme
- 
-@@ -400,6 +400,7 @@
-       # @param [Array<String>] files the set of documentation files
-       def add_extra_files(*files)
-         files.map! {|f| f.include?("*") ? Dir.glob(f) : f }.flatten!
-+        files.sort!
-         files.each do |file|
-           if File.file?(file)
-             options.files << CodeObjects::ExtraFileObject.new(file)
diff --git a/debian/patches/move_yard_config_to_tmp_in_spec.patch b/debian/patches/move_yard_config_to_tmp_in_spec.patch
deleted file mode 100644
index 01af4b1..0000000
--- a/debian/patches/move_yard_config_to_tmp_in_spec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: move YARD global configuration directory to tmp/ during specs
- The specs try to write in this directory. The default location is in $HOME
- which is undefined and causes build failures with sbuild.
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738409
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2016-02-20
-
---- a/spec/config_spec.rb
-+++ b/spec/config_spec.rb
-@@ -1,8 +1,20 @@
- require File.join(File.dirname(__FILE__), "spec_helper")
- 
- require 'yaml'
-+require 'tmpdir'
- 
- describe YARD::Config do
-+  before :all do
-+    YARD::Config::CONFIG_DIR=Dir.mktmpdir
-+    YARD::Config::CONFIG_FILE=File.join(CONFIG_DIR, 'config')
-+  end
-+
-+  after :all do
-+    Dir.rmdir(YARD::Config::CONFIG_DIR)
-+    YARD::Config::CONFIG_DIR=File.expand_path('~/.yard')
-+    YARD::Config::CONFIG_FILE=File.join(CONFIG_DIR, 'config')
-+  end
-+
-   describe ".load" do
-     before do
-       expect(File).to receive(:file?).twice.with(CLI::Yardoc::DEFAULT_YARDOPTS_FILE).and_return(false)
-@@ -173,4 +185,4 @@
-       expect(YARD::Config.load_plugins).to be false
-     end
-   end
--end
-\ No newline at end of file
-+end
diff --git a/debian/patches/privacy-breach.patch b/debian/patches/privacy-breach.patch
index 26ba533..2936ef9 100644
--- a/debian/patches/privacy-breach.patch
+++ b/debian/patches/privacy-breach.patch
@@ -7,7 +7,7 @@ Last-Update: 2016-07-09
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/README.md
 +++ b/README.md
-@@ -1,13 +1,5 @@
+@@ -1,15 +1,5 @@
  # YARD: Yay! A Ruby Documentation Tool
  
 -[![Homepage](http://img.shields.io/badge/home-yardoc.org-blue.svg)](http://yardoc.org)
@@ -17,7 +17,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -
 -[![Gem Version](https://badge.fury.io/rb/yard.svg)](http://github.com/lsegal/yard/releases)
 -[![Build Status](https://travis-ci.org/lsegal/yard.svg?branch=master)](https://travis-ci.org/lsegal/yard)
+-[![Coverage Status](https://coveralls.io/repos/github/lsegal/yard/badge.svg)](https://coveralls.io/github/lsegal/yard)
 -[![License](http://img.shields.io/badge/license-MIT-yellowgreen.svg)](#license)
- 
+-
  ## Synopsis
  
+ YARD is a documentation generation tool for the Ruby programming language.
diff --git a/debian/patches/relax_specs_for_0_9_5.patch b/debian/patches/relax_specs_for_0_9_5.patch
deleted file mode 100644
index 626f25d..0000000
--- a/debian/patches/relax_specs_for_0_9_5.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Description: amke specs less strict
- To be dropped after the release of 0.9.6
-Author: Loren Segal <lsegal at soen.ca>
-Origin: upstream
-Last-Update: 2016-08-02
-
---- a/spec/cli/server_spec.rb
-+++ b/spec/cli/server_spec.rb
-@@ -119,6 +119,7 @@
-     end
- 
-     it "defaults to .yardoc if no library is specified" do
-+      allow(Dir).to receive(:chdir).and_yield
-       expect(Dir).to receive(:pwd).at_least(:once).and_return(File.expand_path('/path/to/foo'))
-       @libraries['foo'] = [Server::LibraryVersion.new('foo', nil, File.expand_path('/path/to/foo/.yardoc'))]
-       run
---- a/spec/registry_spec.rb
-+++ b/spec/registry_spec.rb
-@@ -17,67 +17,69 @@
-     end
- 
-     it "returns nil if gem isn't found" do
--      expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([])
-+      allow(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([])
-       expect(Registry.yardoc_file_for_gem('foo')).to eq nil
-     end
- 
-     it "allows version to be specified" do
--      expect(Gem.source_index).to receive(:find_name).with('foo', '= 2').and_return([])
-+      allow(Gem.source_index).to receive(:find_name).with('foo', '= 2').and_return([])
-       expect(Registry.yardoc_file_for_gem('foo', '= 2')).to eq nil
-     end
- 
-     it "returns existing .yardoc path for gem when for_writing=false" do
--      expect(File).to receive(:exist?).twice.and_return(false)
--      expect(File).to receive(:exist?).with('/path/to/foo/.yardoc').and_return(true)
--      expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-+      allow(File).to receive(:exist?).twice.and_return(false)
-+      allow(File).to receive(:exist?).with('/path/to/foo/.yardoc').and_return(true)
-+      allow(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-       expect(Registry.yardoc_file_for_gem('foo')).to eq '/path/to/foo/.yardoc'
-     end
- 
-     it "returns new existing .yardoc path for gem when for_writing=false" do
--      expect(File).to receive(:exist?).once.and_return(false)
--      expect(File).to receive(:exist?).with('/path/to/foo/doc/.yardoc').and_return(true)
--      expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-+      allow(File).to receive(:exist?).and_return(false)
-+      allow(File).to receive(:exist?).with('/path/to/foo/doc/.yardoc').and_return(true)
-+      allow(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-       expect(Registry.yardoc_file_for_gem('foo')).to eq '/path/to/foo/doc/.yardoc'
-     end
- 
-     it "returns nil if no .yardoc path exists in gem when for_writing=false" do
--      expect(File).to receive(:exist?).twice.and_return(false)
--      expect(File).to receive(:exist?).with('/path/to/foo/.yardoc').and_return(false)
--      expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-+      allow(File).to receive(:exist?).twice.and_return(false)
-+      allow(File).to receive(:exist?).with('/path/to/foo/.yardoc').and_return(false)
-+      allow(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-       expect(Registry.yardoc_file_for_gem('foo')).to eq nil
-     end
- 
-     it "searches local gem path first if for_writing=false" do
--      expect(File).to receive(:exist?).and_return(true)
--      expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-+      allow(File).to receive(:exist?).and_return(true)
-+      allow(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-       expect(Registry.yardoc_file_for_gem('foo')).to match %r{/.yard/gem_index/foo-1.0.yardoc$}
-     end
- 
-     it "returns global .yardoc path for gem if for_writing=true and dir is 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(true)
--      expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-+      allow(File).to receive(:exist?).and_return(false)
-+      allow(File).to receive(:directory?).with(@gem.doc_dir).and_return(true)
-+      allow(File).to receive(:writable?).with(@gem.doc_dir).and_return(false)
-+      allow(File).to receive(:writable?).with(@gem.full_gem_path).and_return(true)
-+      allow(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-       expect(Registry.yardoc_file_for_gem('foo', '>= 0', true)).to eq '/path/to/foo/.yardoc'
-     end
- 
-     it "returns new global .yardoc path for gem if for_writing=true and dir is writable" do
--      expect(File).to receive(:writable?).with(@gem.doc_dir).and_return(true)
--      expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-+      allow(File).to receive(:writable?).with(@gem.doc_dir).and_return(true)
-+      allow(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-       expect(Registry.yardoc_file_for_gem('foo', '>= 0', true)).to eq '/path/to/foo/doc/.yardoc'
-     end
- 
-     it "returns new global .yardoc path for gem if for_writing=true and parent dir is writable (but dir does not exist)" do
--      expect(File).to receive(:writable?).with(@gem.doc_dir).and_return(false)
--      expect(File).to receive(:directory?).with(@gem.doc_dir).and_return(false)
--      expect(File).to receive(:writable?).with(File.dirname(@gem.doc_dir)).and_return(true)
--      expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-+      allow(File).to receive(:writable?).with(@gem.doc_dir).and_return(false)
-+      allow(File).to receive(:directory?).with(@gem.doc_dir).and_return(false)
-+      allow(File).to receive(:writable?).with(File.dirname(@gem.doc_dir)).and_return(true)
-+      allow(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
-       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
--      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])
-+      allow(File).to receive(:writable?).with(@gem.doc_dir).and_return(false)
-+      allow(File).to receive(:writable?).with(@gem.full_gem_path).and_return(false)
-+      allow(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$}
-     end
- 
-@@ -85,8 +87,8 @@
-       allow(@gem).to receive(:name).and_return('yard-doc-core')
-       allow(@gem).to receive(:full_name).and_return('yard-doc-core-1.0')
-       allow(@gem).to receive(:full_gem_path).and_return('/path/to/yard-doc-core')
--      expect(Gem.source_index).to receive(:find_name).with('yard-doc-core', '>= 0').and_return([@gem])
--      expect(File).to receive(:exist?).with('/path/to/yard-doc-core/.yardoc').and_return(true)
-+      allow(Gem.source_index).to receive(:find_name).with('yard-doc-core', '>= 0').and_return([@gem])
-+      allow(File).to receive(:exist?).with('/path/to/yard-doc-core/.yardoc').and_return(true)
-       expect(Registry.yardoc_file_for_gem('yard-doc-core')).to eq '/path/to/yard-doc-core/.yardoc'
-     end
- 
-@@ -94,8 +96,8 @@
-       allow(@gem).to receive(:name).and_return('yard-doc-core')
-       allow(@gem).to receive(:full_name).and_return('yard-doc-core-1.0')
-       allow(@gem).to receive(:full_gem_path).and_return('/path/to/yard-doc-core')
--      expect(Gem.source_index).to receive(:find_name).with('yard-doc-core', '>= 0').and_return([@gem])
--      expect(File).to receive(:exist?).with('/path/to/yard-doc-core/.yardoc').and_return(true)
-+      allow(Gem.source_index).to receive(:find_name).with('yard-doc-core', '>= 0').and_return([@gem])
-+      allow(File).to receive(:exist?).with('/path/to/yard-doc-core/.yardoc').and_return(true)
-       expect(Registry.yardoc_file_for_gem('yard-doc-core', '>= 0', true)).to eq nil
-     end
-   end
diff --git a/debian/patches/remove_rubygems_and_path_manipulation_from_spec.patch b/debian/patches/remove_rubygems_and_path_manipulation_from_spec.patch
deleted file mode 100644
index 01b262f..0000000
--- a/debian/patches/remove_rubygems_and_path_manipulation_from_spec.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Remove call to rubygems and path manipulation to load yard
- Remove also the use of bundler
- This is not necessary because gem2deb took care of everything already.
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-05-07
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,15 +1,4 @@
--require "rubygems"
--begin
--  require "rspec"
--rescue LoadError
--  require "spec"
--end
--
--begin
--  require 'bundler'
--  Bundler.setup
--rescue LoadError
--end
-+require "rspec"
- 
- begin
-   require 'simplecov'
-@@ -24,7 +13,7 @@
- rescue LoadError
- end if ENV['COVERAGE']
- 
--require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'yard'))
-+require "yard"
- 
- unless defined?(HAVE_RIPPER)
-   begin require 'ripper'; rescue LoadError; end
diff --git a/debian/patches/require-in-executables.patch b/debian/patches/require-in-executables.patch
deleted file mode 100644
index 5ca4074..0000000
--- a/debian/patches/require-in-executables.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Do not modify $LOAD_PATH in YARD binaries
- We know exactly where to find the library
-Author: Cédric Boutiller <boutil at debian.org>
-Last-Update: 2012-05-07
-
---- a/bin/yardoc
-+++ b/bin/yardoc
-@@ -1,11 +1,11 @@
- #!/usr/bin/env ruby
- 
--# We do all this work just to find the proper load path
--path = __FILE__
--while File.symlink?(path)
--  path = File.expand_path(File.readlink(path), File.dirname(path))
--end
--$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
-+## We do all this work just to find the proper load path
-+#path = __FILE__
-+#while File.symlink?(path)
-+#  path = File.expand_path(File.readlink(path), File.dirname(path))
-+#end
-+#$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
- 
- require 'yard'
- 
---- a/bin/yard
-+++ b/bin/yard
-@@ -1,11 +1,11 @@
- #!/usr/bin/env ruby
- 
--# We do all this work just to find the proper load path
--path = __FILE__
--while File.symlink?(path)
--  path = File.expand_path(File.readlink(path), File.dirname(path))
--end
--$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
-+## We do all this work just to find the proper load path
-+#path = __FILE__
-+#while File.symlink?(path)
-+#  path = File.expand_path(File.readlink(path), File.dirname(path))
-+#end
-+#$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
- 
- require 'yard'
- 
---- a/bin/yri
-+++ b/bin/yri
-@@ -1,11 +1,11 @@
- #!/usr/bin/env ruby
- 
--# We do all this work just to find the proper load path
--path = __FILE__
--while File.symlink?(path)
--  path = File.expand_path(File.readlink(path), File.dirname(path))
--end
--$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
-+## We do all this work just to find the proper load path
-+#path = __FILE__
-+#while File.symlink?(path)
-+#  path = File.expand_path(File.readlink(path), File.dirname(path))
-+#end
-+#$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
- 
- require 'yard'
- 
diff --git a/debian/patches/rubygems_plugin_specs.patch b/debian/patches/rubygems_plugin_specs.patch
deleted file mode 100644
index 3b54cd6..0000000
--- a/debian/patches/rubygems_plugin_specs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: copy content of rubygems_plugin.rb in spec instead of loading it
- as it is erased from the binary package.
- This should fix debci tests
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2016-03-11
-Forwarded: not-needed
-
---- a/spec/rubygems/doc_manager_spec.rb
-+++ b/spec/rubygems/doc_manager_spec.rb
-@@ -1,5 +1,9 @@
- require File.dirname(__FILE__) + '/../spec_helper'
--require File.join(YARD::ROOT, 'rubygems_plugin')
-+unless defined?(Gem::DocManager.load_yardoc)
-+  require 'yard/rubygems/specification'
-+  require 'yard/rubygems/doc_manager'
-+end
-+
- require 'fileutils'
- 
- describe Gem::DocManager do
diff --git a/debian/patches/series b/debian/patches/series
index d50bf9f..3555624 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,2 @@
-relax_specs_for_0_9_5.patch
-require-in-executables.patch
-set-templates-path.patch
-remove_rubygems_and_path_manipulation_from_spec.patch
-deactivate_failing_test_with_sbuild.patch
-move_yard_config_to_tmp_in_spec.patch
-fix_template_root_var.patch
 no-timestamps.patch
 privacy-breach.patch
-rubygems_plugin_specs.patch
-force_file_order.patch
diff --git a/debian/patches/set-templates-path.patch b/debian/patches/set-templates-path.patch
deleted file mode 100644
index 75f8f00..0000000
--- a/debian/patches/set-templates-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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-03
-
---- a/lib/yard/templates/engine.rb
-+++ b/lib/yard/templates/engine.rb
-@@ -181,5 +181,7 @@
-     end
- 
-     Engine.register_template_path(File.join(YARD::ROOT, '..', 'templates'))
-+    # add /usr/share/yard/templates
-+    Engine.register_template_path(File.join(YARD::ROOT, '../../../', 'share/yard/templates'))
-   end
- end
diff --git a/debian/rules b/debian/rules
index 9c0a359..608be29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export GEM2DEB_TEST_RUNNER = --check-dependencies
+export DH_RUBY = --gem-install
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
@@ -16,14 +17,6 @@ override_dh_auto_install:
 	dh_auto_install
 	rm -rf doc/
 	rake yard
-	rm debian/yard/usr/lib/ruby/vendor_ruby/yard/rubygems/backports/LICENSE.txt
-	rm debian/yard/usr/lib/ruby/vendor_ruby/rubygems_plugin.rb
-
-override_dh_install:
-	dh_install
-	# yard 0.9.5 ships with most files as executables. chmod the templates to avoid lintian warnings
-	find debian/yard/usr/share/yard/templates -type f -executable -name '*.erb' -exec chmod a-x {} \;
-	find debian/yard/usr/share/yard/templates -type f -executable -name '*.rb' -exec chmod a-x {} \;
 
 override_dh_clean:
 	dh_clean

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

More information about the Pkg-ruby-extras-commits mailing list