[DRE-commits] [nanoc] 03/04: * 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 nanoc.

commit 9bb0fce65032d7bca5d7794666b73d9dcad78fdb
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Aug 21 14:59:15 2014 +0200

    * Refresh patches
---
 debian/changelog                                  |  7 +++++++
 debian/patches/deactivate_test_huge_site.patch    |  4 ++--
 debian/patches/no_bundler_no_loadpath_modif.patch | 11 ++++++++---
 debian/patches/no_rdoc4.patch                     |  4 ++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9db1e96..91645b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nanoc (3.7.2-1) UNRELEASED; urgency=medium
+
+  * Imported Upstream version 3.7.2
+  * Refresh patches
+
+ -- Cédric Boutillier <boutil at debian.org>  Thu, 21 Aug 2014 14:48:29 +0200
+
 nanoc (3.7.0-1) unstable; urgency=medium
 
   * Imported Upstream version 3.7.0
diff --git a/debian/patches/deactivate_test_huge_site.patch b/debian/patches/deactivate_test_huge_site.patch
index 6eeec87..8992372 100644
--- a/debian/patches/deactivate_test_huge_site.patch
+++ b/debian/patches/deactivate_test_huge_site.patch
@@ -3,11 +3,11 @@ Description: deactivate test about compiling huge sites
  Errno::EMLINK: Too many links
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2014-05-09
+Last-Update: 2014-08-21
 
 --- a/test/data_sources/test_filesystem_unified.rb
 +++ b/test/data_sources/test_filesystem_unified.rb
-@@ -499,7 +499,7 @@
+@@ -497,7 +497,7 @@
      assert_equal nil,            data_source.send(:filename_for, '/foo', nil)
    end
  
diff --git a/debian/patches/no_bundler_no_loadpath_modif.patch b/debian/patches/no_bundler_no_loadpath_modif.patch
index 2df69d5..3773b5a 100644
--- a/debian/patches/no_bundler_no_loadpath_modif.patch
+++ b/debian/patches/no_bundler_no_loadpath_modif.patch
@@ -2,18 +2,23 @@ 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: 2014-06-09
+Last-Update: 2014-08-21
 
 --- a/bin/nanoc
 +++ b/bin/nanoc
-@@ -1,17 +1,6 @@
+@@ -1,22 +1,6 @@
  #!/usr/bin/env ruby
  # encoding: utf-8
  
 -# Try loading bundler if it's possible
 -begin
+-  require 'bundler'
 -  require 'bundler/setup'
--  Bundler.require(:default)
+-  begin
+-    Bundler.require(:default)
+-  rescue Bundler::GemfileNotFound
+-    # no problem
+-  end
 -rescue LoadError
 -  # no problem
 -end
diff --git a/debian/patches/no_rdoc4.patch b/debian/patches/no_rdoc4.patch
index b8b3998..f1384b4 100644
--- a/debian/patches/no_rdoc4.patch
+++ b/debian/patches/no_rdoc4.patch
@@ -1,6 +1,6 @@
 Description: do not force RDoc v4 with rubygems
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-04-15
+Last-Update: 2014-08-21
 
 --- a/lib/nanoc/filters/rdoc.rb
 +++ b/lib/nanoc/filters/rdoc.rb
@@ -13,6 +13,6 @@ Last-Update: 2014-04-15
 -      super
 -    end
 -
-     # Runs the content through [RDoc::Markup](http://rdoc.rubyforge.org/RDoc/Markup.html).
+     # Runs the content through [RDoc::Markup](http://docs.seattlerb.org/rdoc/RDoc/Markup.html).
      # This method takes no options.
      #

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