[DRE-commits] [nanoc] 20/21: remove old unused 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 nanoc.

commit 5f22135eb72070ad6e63e59049e1e2ecb192b036
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jan 5 14:20:57 2017 +0100

    remove old unused patches
---
 debian/patches/deactivate_rubygems_in_tests.patch | 18 -------------
 debian/patches/no_bundler_no_loadpath_modif.patch | 31 -----------------------
 debian/patches/no_rdoc4.patch                     | 18 -------------
 debian/patches/series                             |  3 ---
 4 files changed, 70 deletions(-)

diff --git a/debian/patches/deactivate_rubygems_in_tests.patch b/debian/patches/deactivate_rubygems_in_tests.patch
deleted file mode 100644
index e813414..0000000
--- a/debian/patches/deactivate_rubygems_in_tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: do not use gem_loader.rb, which relies on rubygems
-Origin: vendor
-Forwarded: not-needed
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2015-06-03
-
---- a/test/helper.rb
-+++ b/test/helper.rb
-@@ -1,7 +1,8 @@
- # encoding: utf-8
- 
- # Set up gem loading (necessary for cri dependency)
--require File.dirname(__FILE__) + '/gem_loader.rb'
-+require 'cri'
-+#require File.dirname(__FILE__) + '/gem_loader.rb'
- 
- # Load unit testing stuff
- require 'minitest/test'
diff --git a/debian/patches/no_bundler_no_loadpath_modif.patch b/debian/patches/no_bundler_no_loadpath_modif.patch
deleted file mode 100644
index 7ffad25..0000000
--- a/debian/patches/no_bundler_no_loadpath_modif.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: do not use bundler or mess with the load path
-Origin: vendor
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: not-needed
-Last-Update: 2015-06-03
-
---- a/bin/nanoc
-+++ b/bin/nanoc
-@@ -1,22 +1,6 @@
- #!/usr/bin/env ruby
- # encoding: utf-8
- 
--# Try loading bundler if it's possible
--begin
--  require 'bundler'
--  require 'bundler/setup'
--  begin
--    Bundler.require(:default)
--  rescue Bundler::GemfileNotFound
--    # no problem
--  end
--rescue LoadError
--  # no problem
--end if File.file?('Gemfile')
--
--# Add lib to load path
--$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
--
- # Load nanoc
- require 'nanoc'
- require 'nanoc/cli'
diff --git a/debian/patches/no_rdoc4.patch b/debian/patches/no_rdoc4.patch
deleted file mode 100644
index 0e08735..0000000
--- a/debian/patches/no_rdoc4.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: do not force RDoc v4 with rubygems
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2016-02-19
-
---- a/lib/nanoc/filters/rdoc.rb
-+++ b/lib/nanoc/filters/rdoc.rb
-@@ -3,11 +3,6 @@
-   class RDoc < Nanoc::Filter
-     requires 'rdoc'
- 
--    def self.setup
--      gem 'rdoc', '~> 4.0'
--      super
--    end
--
-     # Runs the content through [RDoc::Markup](http://docs.seattlerb.org/rdoc/RDoc/Markup.html).
-     # This method takes no options.
-     #
diff --git a/debian/patches/series b/debian/patches/series
index 92176bf..e24be8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
-#deactivate_rubygems_in_tests.patch
 #deactivate_test_huge_site.patch
-#no_rdoc4.patch
-#no_bundler_no_loadpath_modif.patch
 no_privacy_breach.patch
 no_vcr.patch
 #set-load_paths-for-sass-tests.patch

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