[DRE-commits] [nanoc] 04/10: refresh patches
Cédric Boutillier
boutil at moszumanska.debian.org
Sun Feb 21 21:42:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository nanoc.
commit 987c57e8b17dbf13318d79c55af065eac7e4aec1
Author: Cédric Boutillier <boutil at debian.org>
Date: Sat Feb 20 10:32:31 2016 +0100
refresh patches
---
debian/patches/deactivate_test_huge_site.patch | 15 ++-------------
debian/patches/no_privacy_breach.patch | 11 +++++------
debian/patches/no_rdoc4.patch | 4 ++--
debian/patches/no_vcr.patch | 14 ++++++--------
debian/patches/set-load_paths-for-sass-tests.patch | 8 ++++----
5 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/debian/patches/deactivate_test_huge_site.patch b/debian/patches/deactivate_test_huge_site.patch
index 7725200..48e23f6 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: 2015-06-03
+Last-Update: 2016-02-19
--- a/test/data_sources/test_filesystem_unified.rb
+++ b/test/data_sources/test_filesystem_unified.rb
-@@ -499,7 +499,7 @@
+@@ -483,7 +483,7 @@
assert_equal nil, data_source.send(:filename_for, '/foo', nil)
end
@@ -16,14 +16,3 @@ Last-Update: 2015-06-03
if_implemented do
# Create data source
data_source = new_data_source
---- a/test/data_sources/test_filesystem_verbose.rb
-+++ b/test/data_sources/test_filesystem_verbose.rb
-@@ -333,7 +333,7 @@
- assert_equal 'foo/bar/index', data_source.send(:filename_for, 'foo/bar', '')
- end
-
-- def test_compile_huge_site
-+ def _test_compile_huge_site
- if_implemented do
- # Create data source
- data_source = new_data_source
diff --git a/debian/patches/no_privacy_breach.patch b/debian/patches/no_privacy_breach.patch
index d0893cf..6f000c6 100644
--- a/debian/patches/no_privacy_breach.patch
+++ b/debian/patches/no_privacy_breach.patch
@@ -6,7 +6,7 @@ Description: remove privacy breaches from the documentation
Origin: vendor
Author: Cédric Boutillier <boutil at debian.org>
Forwarded: no
-Last-Update: 2015-06-03
+Last-Update: 2016-02-19
--- a/doc/yardoc_templates/default/layout/html/footer.erb
+++ b/doc/yardoc_templates/default/layout/html/footer.erb
@@ -32,15 +32,14 @@ Last-Update: 2015-06-03
-</script>
--- a/README.md
+++ b/README.md
-@@ -1,11 +1,3 @@
+@@ -1,10 +1,3 @@
-[](http://rubygems.org/gems/nanoc)
-[](https://travis-ci.org/nanoc/nanoc)
-[](https://codeclimate.com/github/nanoc/nanoc)
-[](https://coveralls.io/r/nanoc/nanoc)
--[](http://inch-ci.org/github/nanoc/nanoc/)
-
--
+-
-
- # nanoc
+ # Nanoc
- nanoc is a flexible static site generator written in Ruby. See the [nanoc web site](http://nanoc.ws) for more information.
+ Nanoc is a flexible static-site generator written in Ruby. See the [Nanoc web site](http://nanoc.ws) for more information.
diff --git a/debian/patches/no_rdoc4.patch b/debian/patches/no_rdoc4.patch
index c5faceb..0e08735 100644
--- a/debian/patches/no_rdoc4.patch
+++ b/debian/patches/no_rdoc4.patch
@@ -1,10 +1,10 @@
Description: do not force RDoc v4 with rubygems
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2015-06-03
+Last-Update: 2016-02-19
--- a/lib/nanoc/filters/rdoc.rb
+++ b/lib/nanoc/filters/rdoc.rb
-@@ -4,11 +4,6 @@
+@@ -3,11 +3,6 @@
class RDoc < Nanoc::Filter
requires 'rdoc'
diff --git a/debian/patches/no_vcr.patch b/debian/patches/no_vcr.patch
index 6b265e4..0ae52fb 100644
--- a/debian/patches/no_vcr.patch
+++ b/debian/patches/no_vcr.patch
@@ -4,27 +4,25 @@ Description: ruby-vcr is not yet available in Debian archive
Author: Cédric Boutillier <boutil at debian.org>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695195
Forwarded: not-needed
-Last-Update: 2015-06-03
+Last-Update: 2016-02-19
--- a/test/helper.rb
+++ b/test/helper.rb
-@@ -8,7 +8,6 @@
- require 'minitest/spec'
+@@ -6,17 +6,11 @@
require 'minitest/mock'
+ require 'minitest/autorun'
require 'mocha/setup'
-require 'vcr'
- # Setup coverage
- require 'coveralls'
-@@ -24,11 +23,6 @@
require 'tmpdir'
require 'stringio'
+ require 'yard'
-VCR.configure do |c|
- c.cassette_library_dir = 'test/fixtures/vcr_cassettes'
- c.hook_into :webmock
-end
-
- module Nanoc::TestHelpers
- LIB_DIR = File.expand_path(File.dirname(__FILE__) + '/../lib')
+ require 'nanoc'
+ require 'nanoc/cli'
diff --git a/debian/patches/set-load_paths-for-sass-tests.patch b/debian/patches/set-load_paths-for-sass-tests.patch
index 606412b..e81ca02 100644
--- a/debian/patches/set-load_paths-for-sass-tests.patch
+++ b/debian/patches/set-load_paths-for-sass-tests.patch
@@ -3,11 +3,11 @@ Description: Set :load_paths options for some Sass tests
['.'] to [] causing some test to loose the ability of finding the files they
had to import.
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2015-06-03
+Last-Update: 2016-02-19
--- a/test/filters/test_sass.rb
+++ b/test/filters/test_sass.rb
-@@ -53,7 +53,7 @@
+@@ -61,7 +61,7 @@
File.open('moo.sass', 'w') { |io| io.write "body\n color: red" }
# Run filter
@@ -16,7 +16,7 @@ Last-Update: 2015-06-03
end
end
-@@ -68,7 +68,7 @@
+@@ -76,7 +76,7 @@
File.open('subdir/relative.sass', 'w') { |io| io.write "body\n color: red" }
# Run filter
@@ -25,7 +25,7 @@ Last-Update: 2015-06-03
end
end
-@@ -81,7 +81,7 @@
+@@ -89,7 +89,7 @@
File.open('moo.sass', 'w') { |io| io.write "body\n color: red" }
# Run filter
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/nanoc.git
More information about the Pkg-ruby-extras-commits
mailing list