[DRE-commits] [SCM] yard.git branch, master, updated. debian/0.8.1-1-24-g6a006a9

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 499e58d3781ea141dd47bf93a1692d85a68fab00
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue May 7 14:51:58 2013 +0200

    drop use_yard_gemspec_for_doc_manager_spec.patch, not needed anymore

diff --git a/debian/patches/series b/debian/patches/series
index 34a3530..f981d52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 require-in-executables.patch
 set-templates-path.patch
 remove_rubygems_and_path_manipulation_from_spec.patch
-use_yard_gemspec_for_doc_manager_spec.patch
 deactivate_failing_test_with_sbuild.patch
diff --git a/debian/patches/use_yard_gemspec_for_doc_manager_spec.patch b/debian/patches/use_yard_gemspec_for_doc_manager_spec.patch
deleted file mode 100644
index 8b21937..0000000
--- a/debian/patches/use_yard_gemspec_for_doc_manager_spec.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Temporarily install upstream yard.gemspec to run specs for doc_manager
- The gemspec file is not shipped in the gem, but is used for the tests.
- The yard.gemspec may need to be updated when new versions are packaged
-Origin: vendor
-Last-Update: 2012-06-27
-
---- a/spec/rubygems/doc_manager_spec.rb
-+++ b/spec/rubygems/doc_manager_spec.rb
-@@ -11,7 +11,7 @@
- 
-     YARD::CLI::Yardoc.stub(:run)
- 
--    @spec_file = File.join(YARD::ROOT, '../yard.gemspec')
-+    @spec_file = File.join(File.dirname(__FILE__), '../../yard.gemspec')
-     @spec = Gem::SourceIndex.load_specification(@spec_file)
-     @spec.has_yardoc = false # no yardoc docs for now
-     @yardopts = File.join(@spec.full_gem_path, '.yardopts')
---- /dev/null
-+++ b/yard.gemspec
-@@ -0,0 +1,22 @@
-+require File.expand_path(File.dirname(__FILE__) + '/lib/yard')
-+Gem::Specification.new do |s|
-+  s.name          = "yard"
-+  s.summary       = "Documentation tool for consistent and usable documentation in Ruby."
-+  s.description   = <<-eof
-+    YARD is a documentation generation tool for the Ruby programming language.
-+    It enables the user to generate consistent, usable documentation that can be
-+    exported to a number of formats very easily, and also supports extending for
-+    custom Ruby constructs such as custom class level definitions.
-+  eof
-+  s.version       = YARD::VERSION
-+  s.date          = Time.now.strftime('%Y-%m-%d')
-+  s.author        = "Loren Segal"
-+  s.email         = "lsegal at soen.ca"
-+  s.homepage      = "http://yardoc.org"
-+  s.platform      = Gem::Platform::RUBY
-+  s.files         = Dir.glob("{docs,bin,lib,spec,templates,benchmarks}/**/*") + ['ChangeLog', 'LICENSE', 'LEGAL', 'README.md', 'Rakefile', '.yardopts']
-+  s.require_paths = ['lib']
-+  s.executables   = ['yard', 'yardoc', 'yri']
-+  s.has_rdoc      = 'yard'
-+  s.rubyforge_project = 'yard'
-+end
-\ No newline at end of file

-- 
yard.git