[DRE-commits] [jekyll] 02/07: refresh patches

Cédric Boutillier boutil at moszumanska.debian.org
Wed Aug 24 15:24:02 UTC 2016


This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository jekyll.

commit f10521db74c25df403f3d546f26cc54ebe77166e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Aug 24 16:45:10 2016 +0200

    refresh patches
---
 .../patches/0001-Drop-Ruby-Minitest-Profile.patch  | 16 ++--
 debian/patches/0002-Downgrading-RDoc-as-4.1.patch  |  6 +-
 ...05-Fix-Gemfile-dependencies-drop-redgreen.patch |  5 +-
 .../0006-Fix-Gemfile-versioning-pygments.rb.patch  |  4 +-
 .../patches/0007-Fix-Gemfile-drop-liquid-c.patch   |  4 +-
 ...-patch-Replace-git-execution-from-gemspec.patch | 86 +++++++++++++++-------
 ...Remove-relative-LOAD_PATH-from-bin-jekyll.patch | 12 +--
 debian/patches/0011-fix-test-pygments.patch        | 10 +--
 debian/patches/0012_no_require_relative.patch      | 10 +--
 .../patches/0013_require_coffee_script_test.patch  |  6 +-
 debian/patches/0014_skip_test_autopkgtest.patch    |  6 +-
 debian/patches/series                              |  6 +-
 12 files changed, 103 insertions(+), 68 deletions(-)

diff --git a/debian/patches/0001-Drop-Ruby-Minitest-Profile.patch b/debian/patches/0001-Drop-Ruby-Minitest-Profile.patch
index efb584f..9969196 100644
--- a/debian/patches/0001-Drop-Ruby-Minitest-Profile.patch
+++ b/debian/patches/0001-Drop-Ruby-Minitest-Profile.patch
@@ -1,6 +1,6 @@
 From: Youhei SASAKI <uwabami at gfd-dennou.org>
 Subject: Drop Ruby Minitest Profile
-Last-Update: 2016-06-05
+Last-Update: 2016-08-24
 
 Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -34,7 +34,6 @@
+@@ -41,7 +41,6 @@
    gem "redgreen"
    gem "simplecov"
    gem "minitest-reporters"
@@ -20,11 +20,11 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  end
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -19,7 +19,6 @@
- require 'ostruct'
- require 'minitest/autorun'
- require 'minitest/reporters'
--require 'minitest/profile'
- require 'rspec/mocks'
+@@ -26,7 +26,6 @@
+ require "ostruct"
+ require "minitest/autorun"
+ require "minitest/reporters"
+-require "minitest/profile"
+ require "rspec/mocks"
  require_relative "../lib/jekyll.rb"
  
diff --git a/debian/patches/0002-Downgrading-RDoc-as-4.1.patch b/debian/patches/0002-Downgrading-RDoc-as-4.1.patch
index 9552f7d..b783750 100644
--- a/debian/patches/0002-Downgrading-RDoc-as-4.1.patch
+++ b/debian/patches/0002-Downgrading-RDoc-as-4.1.patch
@@ -1,5 +1,5 @@
 From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Last-Update: 2016-06-05
+Last-Update: 2016-08-24
 Subject: Downgrading RDoc as 4.1
 
 Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
@@ -9,8 +9,8 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -62,7 +62,7 @@
-   gem "jekyll-paginate", "~> 1.0"
+@@ -69,7 +69,7 @@
+   gem "jekyll-paginate"
    gem "mime-types", "~> 3.0"
    gem "kramdown", "~> 1.9"
 -  gem "rdoc", "~> 4.2"
diff --git a/debian/patches/0005-Fix-Gemfile-dependencies-drop-redgreen.patch b/debian/patches/0005-Fix-Gemfile-dependencies-drop-redgreen.patch
index f75c510..4568aa7 100644
--- a/debian/patches/0005-Fix-Gemfile-dependencies-drop-redgreen.patch
+++ b/debian/patches/0005-Fix-Gemfile-dependencies-drop-redgreen.patch
@@ -1,6 +1,5 @@
 From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Last-Update: 2016-06-05
-
+Last-Update: 2016-08-24
 Subject: Fix Gemfile dependencies: drop redgreen
 
 Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
@@ -10,7 +9,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -31,7 +31,6 @@
+@@ -38,7 +38,6 @@
      gem 'test-unit'
    end
  
diff --git a/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch b/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch
index 7c3a38b..5830cba 100644
--- a/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch
+++ b/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch
@@ -1,6 +1,6 @@
 From: Debian Ruby Extras Maintainers
  <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Sun, 6 Dec 2015 21:48:04 +0900
+Last-Update: 2016-08-24
 Subject: Fix-Gemfile-versioning-pygments.rb
 
 ---
@@ -9,7 +9,7 @@ Subject: Fix-Gemfile-versioning-pygments.rb
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -65,7 +65,7 @@
+@@ -72,7 +72,7 @@
  
    platform :ruby, :mswin, :mingw do
      gem "rdiscount", "~> 2.0"
diff --git a/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch b/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch
index 37eae55..dee1f81 100644
--- a/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch
+++ b/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch
@@ -1,6 +1,6 @@
 From: Debian Ruby Extras Maintainers
  <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Last-Update: 2016-06-05
+Last-Update: 2016-08-24
 Subject: Fix-Gemfile-drop-liquid-c
 
 ---
@@ -9,7 +9,7 @@ Subject: Fix-Gemfile-drop-liquid-c
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -68,7 +68,6 @@
+@@ -75,7 +75,6 @@
      gem "pygments.rb"
      gem "redcarpet", "~> 3.2", ">= 3.2.3"
      gem "classifier-reborn", "~> 2.0"
diff --git a/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch b/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch
index 7f5c543..ea199f1 100644
--- a/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch
+++ b/debian/patches/0008-Add-patch-Replace-git-execution-from-gemspec.patch
@@ -1,5 +1,5 @@
 From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Last-Update: 2016-06-05
+Last-Update: 2016-08-24
 Subject: Add patch: Replace git execution from gemspec
 
 Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
@@ -9,37 +9,45 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 
 --- a/jekyll.gemspec
 +++ b/jekyll.gemspec
-@@ -20,7 +20,444 @@
+@@ -20,7 +20,480 @@
    s.email         = 'tom at mojombo.com'
    s.homepage      = 'https://github.com/jekyll/jekyll'
  
 -  all_files       = `git ls-files -z`.split("\x0")
 +  all_files       = ["CONDUCT.markdown",
-+                     "CONTRIBUTING.markdown",
 +                     "Gemfile",
-+                     "Gemfile.rej",
 +                     "History.markdown",
-+                     "ISSUE_TEMPLATE.md",
 +                     "LICENSE",
 +                     "README.markdown",
 +                     "Rakefile",
++                     "appveyor.yml",
++                     "benchmark/capture-assign.rb",
 +                     "benchmark/end-with-vs-regexp",
 +                     "benchmark/file-dir-ensure-trailing-slash",
 +                     "benchmark/flat-map",
 +                     "benchmark/hash-fetch",
 +                     "benchmark/jekyll-sanitize-path",
 +                     "benchmark/proc-call-vs-yield",
++                     "benchmark/regexp-vs-include.rb",
 +                     "benchmark/sequential-assignment",
 +                     "benchmark/string-concat",
 +                     "benchmark/string-replacement",
 +                     "benchmark/symbol-to-proc",
-+                     "bin/jekyll",
++                     "docs/avoiding-burnout.md",
++                     "docs/becoming-a-maintainer.md",
++                     "docs/merging-a-pull-request.md",
++                     "docs/readme.md",
++                     "docs/reviewing-a-pull-request.md",
++                     "docs/special-labels.md",
++                     "docs/triaging-an-issue.md",
++                     "exe/jekyll",
 +                     "features/collections.feature",
 +                     "features/create_sites.feature",
 +                     "features/data.feature",
 +                     "features/drafts.feature",
 +                     "features/embed_filters.feature",
 +                     "features/frontmatter_defaults.feature",
++                     "features/highlighting.feature",
 +                     "features/hooks.feature",
 +                     "features/include_tag.feature",
 +                     "features/incremental_rebuild.feature",
@@ -56,6 +64,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "features/step_definitions.rb",
 +                     "features/support/formatter.rb",
 +                     "features/support/helpers.rb",
++                     "features/theme.feature",
 +                     "jekyll.gemspec",
 +                     "jekyll.gemspec.rej",
 +                     "lib/jekyll.rb",
@@ -67,6 +76,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "lib/jekyll/commands/doctor.rb",
 +                     "lib/jekyll/commands/help.rb",
 +                     "lib/jekyll/commands/new.rb",
++                     "lib/jekyll/commands/new_theme.rb",
 +                     "lib/jekyll/commands/serve.rb",
 +                     "lib/jekyll/commands/serve/servlet.rb",
 +                     "lib/jekyll/configuration.rb",
@@ -122,31 +132,34 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "lib/jekyll/stevenson.rb",
 +                     "lib/jekyll/tags/highlight.rb",
 +                     "lib/jekyll/tags/include.rb",
++                     "lib/jekyll/tags/link.rb",
 +                     "lib/jekyll/tags/post_url.rb",
++                     "lib/jekyll/theme.rb",
++                     "lib/jekyll/theme_builder.rb",
 +                     "lib/jekyll/url.rb",
 +                     "lib/jekyll/utils.rb",
 +                     "lib/jekyll/utils/ansi.rb",
 +                     "lib/jekyll/utils/platforms.rb",
 +                     "lib/jekyll/version.rb",
 +                     "lib/site_template/_config.yml",
-+                     "lib/site_template/_includes/footer.html",
-+                     "lib/site_template/_includes/head.html",
-+                     "lib/site_template/_includes/header.html",
-+                     "lib/site_template/_includes/icon-github.html",
-+                     "lib/site_template/_includes/icon-github.svg",
-+                     "lib/site_template/_includes/icon-twitter.html",
-+                     "lib/site_template/_includes/icon-twitter.svg",
-+                     "lib/site_template/_layouts/default.html",
-+                     "lib/site_template/_layouts/page.html",
-+                     "lib/site_template/_layouts/post.html",
 +                     "lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb",
-+                     "lib/site_template/_sass/_base.scss",
-+                     "lib/site_template/_sass/_layout.scss",
-+                     "lib/site_template/_sass/_syntax-highlighting.scss",
 +                     "lib/site_template/about.md",
 +                     "lib/site_template/css/main.scss",
 +                     "lib/site_template/feed.xml",
 +                     "lib/site_template/index.html",
++                     "lib/theme_template/CODE_OF_CONDUCT.md.erb",
++                     "lib/theme_template/Gemfile",
++                     "lib/theme_template/LICENSE.txt.erb",
++                     "lib/theme_template/README.md.erb",
++                     "lib/theme_template/_layouts/default.html",
++                     "lib/theme_template/_layouts/page.html",
++                     "lib/theme_template/_layouts/post.html",
++                     "lib/theme_template/example/_config.yml.erb",
++                     "lib/theme_template/example/_post.md",
++                     "lib/theme_template/example/index.html",
++                     "lib/theme_template/example/style.scss",
++                     "lib/theme_template/gitignore.erb",
++                     "lib/theme_template/theme.gemspec.erb",
 +                     "rake/docs.rake",
 +                     "rake/release.rake",
 +                     "rake/site.rake",
@@ -155,16 +168,21 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "script/cibuild",
 +                     "script/console",
 +                     "script/cucumber",
++                     "script/default-site",
++                     "script/fmt",
 +                     "script/proof",
++                     "script/rubies",
 +                     "script/rubyprof",
 +                     "script/stackprof",
 +                     "script/test",
 +                     "script/travis",
 +                     "script/vendor-mimes",
++                     "site/404.html",
 +                     "site/CNAME",
 +                     "site/README.md",
 +                     "site/_config.yml",
 +                     "site/_data/docs.yml",
++                     "site/_data/jekyllconf-talks.yml",
 +                     "site/_docs/assets.md",
 +                     "site/_docs/collections.md",
 +                     "site/_docs/conduct.md",
@@ -192,12 +210,10 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "site/_docs/static_files.md",
 +                     "site/_docs/structure.md",
 +                     "site/_docs/templates.md",
++                     "site/_docs/themes.md",
 +                     "site/_docs/troubleshooting.md",
 +                     "site/_docs/upgrading.md",
-+                     "site/_docs/upgrading.md~upstream",
 +                     "site/_docs/upgrading/0-to-2.md",
-+                     "site/_docs/upgrading/0-to-2.md~HEAD",
-+                     "site/_docs/upgrading/0-to-2.md~upstream",
 +                     "site/_docs/upgrading/2-to-3.md",
 +                     "site/_docs/usage.md",
 +                     "site/_docs/variables.md",
@@ -218,6 +234,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "site/_includes/top.html",
 +                     "site/_layouts/default.html",
 +                     "site/_layouts/docs.html",
++                     "site/_layouts/error.html",
 +                     "site/_layouts/news.html",
 +                     "site/_layouts/news_item.html",
 +                     "site/_layouts/page.html",
@@ -263,11 +280,22 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "site/_posts/2016-01-28-jekyll-3-1-1-released.markdown",
 +                     "site/_posts/2016-02-08-jekyll-3-0-3-released.markdown",
 +                     "site/_posts/2016-02-19-jekyll-3-1-2-released.markdown",
++                     "site/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md",
++                     "site/_posts/2016-04-19-jekyll-3-0-4-released.markdown",
++                     "site/_posts/2016-04-19-jekyll-3-1-3-released.markdown",
++                     "site/_posts/2016-04-26-jekyll-3-0-5-released.markdown",
++                     "site/_posts/2016-05-18-jekyll-3-1-4-released.markdown",
++                     "site/_posts/2016-05-18-jekyll-3-1-5-released.markdown",
++                     "site/_posts/2016-05-19-jekyll-3-1-6-released.markdown",
++                     "site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown",
++                     "site/_posts/2016-07-26-jekyll-3-2-0-released.markdown",
++                     "site/_posts/2016-08-02-jekyll-3-2-1-released.markdown",
 +                     "site/_sass/_font-awesome.scss",
 +                     "site/_sass/_gridism.scss",
 +                     "site/_sass/_mixins.scss",
 +                     "site/_sass/_pygments.scss",
 +                     "site/_sass/_style.scss",
++                     "site/community/index.md",
 +                     "site/css/screen.scss",
 +                     "site/favicon.ico",
 +                     "site/fonts/fontawesome-webfont.eot",
@@ -296,7 +324,12 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "test/fixtures/empty_permalink.erb",
 +                     "test/fixtures/exploit_front_matter.erb",
 +                     "test/fixtures/front_matter.erb",
++                     "test/fixtures/test-theme/_includes/include.html",
++                     "test/fixtures/test-theme/_layouts/default.html",
++                     "test/fixtures/test-theme/_sass/style.scss",
++                     "test/fixtures/test-theme/test-theme.gemspec",
 +                     "test/helper.rb",
++                     "test/helper.rb.rej",
 +                     "test/safe_glob_test[/find_me.txt",
 +                     "test/simplecov_custom_profile.rb",
 +                     "test/source/+/%# +.md",
@@ -316,6 +349,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "test/source/_layouts/post/simple.html",
 +                     "test/source/_layouts/simple.html",
 +                     "test/source/_methods/_do_not_read_me.md",
++                     "test/source/_methods/collection/entries",
 +                     "test/source/_methods/configuration.md",
 +                     "test/source/_methods/escape-+ #%20[].md",
 +                     "test/source/_methods/sanitized_path.md",
@@ -427,6 +461,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "test/test_convertible.rb",
 +                     "test/test_doctor_command.rb",
 +                     "test/test_document.rb",
++                     "test/test_drop.rb",
 +                     "test/test_entry_filter.rb",
 +                     "test/test_excerpt.rb",
 +                     "test/test_excerpt_drop.rb",
@@ -450,8 +485,9 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +                     "test/test_site.rb",
 +                     "test/test_static_file.rb",
 +                     "test/test_tags.rb",
++                     "test/test_theme.rb",
 +                     "test/test_url.rb",
 +                     "test/test_utils.rb"]
-   s.files         = all_files.grep(%r{^(bin|lib)/|^.rubocop.yml$})
-   s.executables   = all_files.grep(%r{^bin/}) { |f| File.basename(f) }
-   s.require_paths = ['lib']
+   s.files         = all_files.grep(%r{^(exe|lib)/|^.rubocop.yml$})
+   s.executables   = all_files.grep(%r{^exe/}) { |f| File.basename(f) }
+   s.bindir        = "exe"
diff --git a/debian/patches/0009-Remove-relative-LOAD_PATH-from-bin-jekyll.patch b/debian/patches/0009-Remove-relative-LOAD_PATH-from-bin-jekyll.patch
index c509a90..94cfa81 100644
--- a/debian/patches/0009-Remove-relative-LOAD_PATH-from-bin-jekyll.patch
+++ b/debian/patches/0009-Remove-relative-LOAD_PATH-from-bin-jekyll.patch
@@ -1,5 +1,5 @@
 From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Last-Update: 2016-06-05
+Last-Update: 2016-08-24
 Subject: Remove relative LOAD_PATH from bin/jekyll
 
 Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
@@ -7,14 +7,14 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  bin/jekyll | 2 --
  1 file changed, 2 deletions(-)
 
---- a/bin/jekyll
-+++ b/bin/jekyll
+--- a/exe/jekyll
++++ b/exe/jekyll
 @@ -1,8 +1,6 @@
  #!/usr/bin/env ruby
  STDOUT.sync = true
  
--$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
+-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w(.. lib)))
 -
- require 'jekyll'
- require 'mercenary'
+ require "jekyll"
+ require "mercenary"
  
diff --git a/debian/patches/0011-fix-test-pygments.patch b/debian/patches/0011-fix-test-pygments.patch
index 8a4e2f7..acba49c 100644
--- a/debian/patches/0011-fix-test-pygments.patch
+++ b/debian/patches/0011-fix-test-pygments.patch
@@ -3,16 +3,16 @@ Description: fix test using pygments
  to be maintained until a new version of ruby-pygments.rb
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2016-06-05
+Last-Update: 2016-08-24
 
 --- a/test/test_redcarpet.rb
 +++ b/test/test_redcarpet.rb
-@@ -49,7 +49,7 @@
+@@ -53,7 +53,7 @@
  puts "Hello world"
  ```
-           EOS
--        ).strip
-+        ).strip.gsub(/<span><\/span>/,"")
+ EOS
+-                     ).strip
++                     ).strip.gsub(/<span><\/span>/,"")
        end
      end
  
diff --git a/debian/patches/0012_no_require_relative.patch b/debian/patches/0012_no_require_relative.patch
index 6af521c..d7ed71e 100644
--- a/debian/patches/0012_no_require_relative.patch
+++ b/debian/patches/0012_no_require_relative.patch
@@ -3,14 +3,14 @@ Description: don't use require_relative for tests
  LOAD_PATH and should fix autopkgtests
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2016-06-05
+Last-Update: 2016-08-24
 
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -20,7 +20,7 @@
- require 'minitest/autorun'
- require 'minitest/reporters'
- require 'rspec/mocks'
+@@ -27,7 +27,7 @@
+ require "minitest/autorun"
+ require "minitest/reporters"
+ require "rspec/mocks"
 -require_relative "../lib/jekyll.rb"
 +require "jekyll"
  
diff --git a/debian/patches/0013_require_coffee_script_test.patch b/debian/patches/0013_require_coffee_script_test.patch
index 4577451..3fa41de 100644
--- a/debian/patches/0013_require_coffee_script_test.patch
+++ b/debian/patches/0013_require_coffee_script_test.patch
@@ -1,13 +1,13 @@
 Description: require coffee_script for autopkgtests
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2016-06-05
+Last-Update: 2016-08-24
 
 --- a/test/test_coffeescript.rb
 +++ b/test/test_coffeescript.rb
 @@ -1,4 +1,5 @@
- require 'helper'
-+require 'coffee_script'
+ require "helper"
++require "coffee_script"
  
  class TestCoffeeScript < JekyllUnitTest
    context "converting CoffeeScript" do
diff --git a/debian/patches/0014_skip_test_autopkgtest.patch b/debian/patches/0014_skip_test_autopkgtest.patch
index 0d6025c..ac2f99d 100644
--- a/debian/patches/0014_skip_test_autopkgtest.patch
+++ b/debian/patches/0014_skip_test_autopkgtest.patch
@@ -5,12 +5,12 @@ Last-Update: 2016-06-05
 
 --- a/test/test_new_command.rb
 +++ b/test/test_new_command.rb
-@@ -47,7 +47,7 @@
-         File.extname(f) == '.markdown'
+@@ -57,7 +57,7 @@
+         File.extname(f) == ".markdown"
        end
  
 -      assert_same_elements static_template_files, new_site_files
 +      assert_same_elements static_template_files, new_site_files unless ENV["ADTTMP"]
      end
  
-     should 'process any ERB files' do
+     should "process any ERB files" do
diff --git a/debian/patches/series b/debian/patches/series
index 4f6367c..46f8377 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,10 +5,10 @@
 0007-Fix-Gemfile-drop-liquid-c.patch
 0008-Add-patch-Replace-git-execution-from-gemspec.patch
 0009-Remove-relative-LOAD_PATH-from-bin-jekyll.patch
-0010-require-openssl.patch
+#0010-require-openssl.patch
 0011-fix-test-pygments.patch
 0012_no_require_relative.patch
 0013_require_coffee_script_test.patch
 0014_skip_test_autopkgtest.patch
-adapt_test_rouge2.patch
-relax-colorator.patch
+#adapt_test_rouge2.patch
+#relax-colorator.patch

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



More information about the Pkg-ruby-extras-commits mailing list