[DRE-commits] [nanoc] 03/08: Refresh no_privacy_breach.patch and no_rdoc4.patch

[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 6473ddedca79fb14199003e7907ea5549d0e477e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Apr 15 10:57:54 2014 +0200

    Refresh no_privacy_breach.patch and no_rdoc4.patch
---
 debian/patches/no_privacy_breach.patch | 16 ++++++++++------
 debian/patches/no_rdoc4.patch          | 35 +++++++---------------------------
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/debian/patches/no_privacy_breach.patch b/debian/patches/no_privacy_breach.patch
index bdda13b..b1ae4de 100644
--- a/debian/patches/no_privacy_breach.patch
+++ b/debian/patches/no_privacy_breach.patch
@@ -1,10 +1,11 @@
 Description: remove privacy breaches from the documentation
  - Google AdSense footers
- - links to Travis and Code Climate services
+ - links to Travis and Code Climate services, coverage status and nanoc online
+   logo
 Origin: vendor
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2014-02-14
+Last-Update: 2014-04-15
 
 --- a/doc/yardoc_templates/default/layout/html/footer.erb
 +++ b/doc/yardoc_templates/default/layout/html/footer.erb
@@ -30,10 +31,13 @@ Last-Update: 2014-02-14
 -</script>
 --- a/README.md
 +++ b/README.md
-@@ -1,6 +1,3 @@
+@@ -1,9 +1,3 @@
 -[![Build Status](https://travis-ci.org/nanoc/nanoc.png)](https://travis-ci.org/nanoc/nanoc)
--[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/nanoc/nanoc)
+-[![Code Climate](https://codeclimate.com/github/nanoc/nanoc.png)](https://codeclimate.com/github/nanoc/nanoc)
+-[![Coverage Status](https://coveralls.io/repos/nanoc/nanoc/badge.png?branch=master)](https://coveralls.io/r/nanoc/nanoc)
+-[![Gem Version](https://badge.fury.io/rb/nanoc.png)](http://badge.fury.io/rb/nanoc)
 -
- **Please take a moment and [donate](http://pledgie.com/campaigns/9282) to nanoc. A lot of time has gone into developing nanoc, and I would like to keep the current pace. Your support will ensure that nanoc will continue to improve.**
+-![nanoc logo](https://avatars1.githubusercontent.com/u/3260163?s=140)
+ 
+ # nanoc
  
- # nanoc 3
diff --git a/debian/patches/no_rdoc4.patch b/debian/patches/no_rdoc4.patch
index 1ae271e..b8b3998 100644
--- a/debian/patches/no_rdoc4.patch
+++ b/debian/patches/no_rdoc4.patch
@@ -1,39 +1,18 @@
 Description: do not force RDoc v4 with rubygems
- That is basically reverting the following upstream commit
- https://github.com/nanoc/nanoc/commit/e404ac286970720095535e306db84e1117a88a08
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-09-02
+Last-Update: 2014-04-15
 
 --- a/lib/nanoc/filters/rdoc.rb
 +++ b/lib/nanoc/filters/rdoc.rb
-@@ -3,11 +3,10 @@
- module Nanoc::Filters
-   class RDoc < Nanoc::Filter
+@@ -5,11 +5,6 @@
+ 
+     requires 'rdoc'
  
--    requires 'rdoc'
--
 -    def self.setup
 -      gem 'rdoc', '~> 4.0'
 -      super
-+    if /^2.0/ =~ RUBY_VERSION
-+      requires 'rdoc'
-+    else
-+      requires 'rdoc/markup', 'rdoc/markup/to_html'
-     end
- 
+-    end
+-
      # Runs the content through [RDoc::Markup](http://rdoc.rubyforge.org/RDoc/Markup.html).
-@@ -17,8 +16,12 @@
+     # This method takes no options.
      #
-     # @return [String] The filtered content
-     def run(content, params={})
--      options = ::RDoc::Options.new
--      to_html = ::RDoc::Markup::ToHtml.new(options)
-+      if /^2.0/ =~ RUBY_VERSION
-+        options = ::RDoc::Options.new
-+        to_html = ::RDoc::Markup::ToHtml.new(options)
-+      else
-+        to_html = ::RDoc::Markup::ToHtml.new
-+      end
-       ::RDoc::Markup.new.convert(content, to_html)
-     end
- 

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