[DRE-commits] [jekyll] 06/17: refresh patches
Cédric Boutillier
boutil at moszumanska.debian.org
Sun Jun 5 20:33:03 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 f92758f2b182ab35838c01bf60a306e5a86d817d
Author: Cédric Boutillier <boutil at debian.org>
Date: Sun Jun 5 11:24:28 2016 +0200
refresh patches
---
.../patches/0001-Drop-Ruby-Minitest-Profile.patch | 26 +-
debian/patches/0002-Downgrading-RDoc-as-4.1.patch | 23 +-
...05-Fix-Gemfile-dependencies-drop-redgreen.patch | 19 +-
.../0006-Fix-Gemfile-versioning-pygments.rb.patch | 18 +-
.../patches/0007-Fix-Gemfile-drop-liquid-c.patch | 16 +-
...-patch-Replace-git-execution-from-gemspec.patch | 447 ++++++++++++++++++++-
...Remove-relative-LOAD_PATH-from-bin-jekyll.patch | 6 +-
7 files changed, 488 insertions(+), 67 deletions(-)
diff --git a/debian/patches/0001-Drop-Ruby-Minitest-Profile.patch b/debian/patches/0001-Drop-Ruby-Minitest-Profile.patch
index dc1b2ad..efb584f 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>
-Date: Tue, 3 Nov 2015 10:07:12 +0900
Subject: Drop Ruby Minitest Profile
+Last-Update: 2016-06-05
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
@@ -8,27 +8,23 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
test/helper.rb | 1 -
2 files changed, 2 deletions(-)
-diff --git a/Gemfile b/Gemfile
-index 9b64809..9ddb15b 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -17,7 +17,6 @@ group :test do
- gem 'jekyll_test_plugin'
- gem 'jekyll_test_plugin_malicious'
- gem 'minitest-reporters'
-- gem 'minitest-profile'
- gem 'minitest'
- gem 'rspec-mocks'
-
-diff --git a/test/helper.rb b/test/helper.rb
-index dc02176..25dfc2e 100644
+@@ -34,7 +34,6 @@
+ gem "redgreen"
+ gem "simplecov"
+ gem "minitest-reporters"
+- gem "minitest-profile"
+ gem "minitest"
+ gem "shoulda"
+ end
--- a/test/helper.rb
+++ b/test/helper.rb
-@@ -15,7 +15,6 @@ require 'rubygems'
+@@ -19,7 +19,6 @@
require 'ostruct'
require 'minitest/autorun'
require 'minitest/reporters'
-require 'minitest/profile'
require 'rspec/mocks'
+ require_relative "../lib/jekyll.rb"
- require 'jekyll'
diff --git a/debian/patches/0002-Downgrading-RDoc-as-4.1.patch b/debian/patches/0002-Downgrading-RDoc-as-4.1.patch
index 7fd786f..9552f7d 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>
-Date: Tue, 3 Nov 2015 10:10:47 +0900
+Last-Update: 2016-06-05
Subject: Downgrading RDoc as 4.1
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
@@ -7,19 +7,14 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Gemfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/Gemfile b/Gemfile
-index 9ddb15b..19936a2 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -3,9 +3,9 @@ gemspec name: 'jekyll'
-
- gem 'rake', '~> 10.1'
- group :development do
-- gem 'rdoc', '~> 4.2'
-+ gem 'rdoc', '~> 4.1'
- gem 'launchy', '~> 2.3'
-- gem 'toml', '~> 0.1.0'
-+ gem 'toml', '=> 0.1.0'
- gem 'pry'
- end
+@@ -62,7 +62,7 @@
+ gem "jekyll-paginate", "~> 1.0"
+ gem "mime-types", "~> 3.0"
+ gem "kramdown", "~> 1.9"
+- gem "rdoc", "~> 4.2"
++ gem "rdoc", "~> 4.1"
+ platform :ruby, :mswin, :mingw do
+ gem "rdiscount", "~> 2.0"
diff --git a/debian/patches/0005-Fix-Gemfile-dependencies-drop-redgreen.patch b/debian/patches/0005-Fix-Gemfile-dependencies-drop-redgreen.patch
index 0e55092..f75c510 100644
--- a/debian/patches/0005-Fix-Gemfile-dependencies-drop-redgreen.patch
+++ b/debian/patches/0005-Fix-Gemfile-dependencies-drop-redgreen.patch
@@ -1,5 +1,6 @@
From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Wed, 4 Nov 2015 15:14:57 +0900
+Last-Update: 2016-06-05
+
Subject: Fix Gemfile dependencies: drop redgreen
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
@@ -7,15 +8,13 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Gemfile | 1 -
1 file changed, 1 deletion(-)
-diff --git a/Gemfile b/Gemfile
-index 63cb1bc..127b521 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -9,7 +9,6 @@ group :development do
- end
+@@ -31,7 +31,6 @@
+ gem 'test-unit'
+ end
- group :test do
-- gem 'redgreen', '~> 1.2'
- gem 'shoulda', '~> 3.5'
- gem 'cucumber', '~> 2.0', '< 2.1'
- gem 'simplecov', '~> 0.9'
+- gem "redgreen"
+ gem "simplecov"
+ gem "minitest-reporters"
+ gem "minitest"
diff --git a/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch b/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch
index 5d47930..7c3a38b 100644
--- a/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch
+++ b/debian/patches/0006-Fix-Gemfile-versioning-pygments.rb.patch
@@ -7,16 +7,14 @@ Subject: Fix-Gemfile-versioning-pygments.rb
Gemfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Gemfile b/Gemfile
-index 127b521..b13fbc9 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -45,7 +45,7 @@ gem 'kramdown', '~> 1.9'
+@@ -65,7 +65,7 @@
- platform :ruby, :mswin, :mingw do
- gem 'rdiscount', '~> 2.0'
-- gem 'pygments.rb', '~> 0.6.0'
-+ gem 'pygments.rb'
- gem 'redcarpet', '~> 3.2', '>= 3.2.3'
- gem 'classifier-reborn', '~> 2.0'
- gem 'liquid-c', '~> 3.0'
+ platform :ruby, :mswin, :mingw do
+ gem "rdiscount", "~> 2.0"
+- gem "pygments.rb", "~> 0.6.0"
++ gem "pygments.rb"
+ gem "redcarpet", "~> 3.2", ">= 3.2.3"
+ gem "classifier-reborn", "~> 2.0"
+ gem "liquid-c", "~> 3.0"
diff --git a/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch b/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch
index b27f3cd..37eae55 100644
--- a/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch
+++ b/debian/patches/0007-Fix-Gemfile-drop-liquid-c.patch
@@ -1,19 +1,19 @@
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-06-05
Subject: Fix-Gemfile-drop-liquid-c
---
Gemfile | 1 -
1 file changed, 1 deletion(-)
-diff --git a/Gemfile b/Gemfile
-index b13fbc9..89f52f4 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -48,5 +48,4 @@ platform :ruby, :mswin, :mingw do
- gem 'pygments.rb'
- gem 'redcarpet', '~> 3.2', '>= 3.2.3'
- gem 'classifier-reborn', '~> 2.0'
-- gem 'liquid-c', '~> 3.0'
+@@ -68,7 +68,6 @@
+ gem "pygments.rb"
+ gem "redcarpet", "~> 3.2", ">= 3.2.3"
+ gem "classifier-reborn", "~> 2.0"
+- gem "liquid-c", "~> 3.0"
+ end
end
+
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 4ee4729..7f5c543 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>
-Date: Sun, 6 Dec 2015 21:49:02 +0900
+Last-Update: 2016-06-05
Subject: Add patch: Replace git execution from gemspec
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
@@ -7,16 +7,451 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
jekyll.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/jekyll.gemspec b/jekyll.gemspec
-index 470781c..c4e0706 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
-@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
+@@ -20,7 +20,444 @@
s.email = 'tom at mojombo.com'
s.homepage = 'https://github.com/jekyll/jekyll'
- all_files = `git ls-files -z`.split("\x0")
-+ all_files = [".gitignore",".jrubyrc",".travis.yml","CONDUCT.md","CONTRIBUTING.markdown","Gemfile","History.markdown","LICENSE","README.markdown","Rakefile","benchmark/end-with-vs-regexp","benchmark/flat-map","benchmark/hash-fetch","benchmark/jekyll-sanitize-path","benchmark/proc-call-vs-yield","benchmark/sequential-assignment","benchmark/string-concat","benchmark/string-replacement","benchmark/symbol-to-proc","bin/jekyll","checksums.yaml.gz","docs/jp/CONTRIBUTING.jp.markdown","d [...]
- s.files = all_files.grep(%r{^(bin|lib)/})
++ all_files = ["CONDUCT.markdown",
++ "CONTRIBUTING.markdown",
++ "Gemfile",
++ "Gemfile.rej",
++ "History.markdown",
++ "ISSUE_TEMPLATE.md",
++ "LICENSE",
++ "README.markdown",
++ "Rakefile",
++ "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/sequential-assignment",
++ "benchmark/string-concat",
++ "benchmark/string-replacement",
++ "benchmark/symbol-to-proc",
++ "bin/jekyll",
++ "features/collections.feature",
++ "features/create_sites.feature",
++ "features/data.feature",
++ "features/drafts.feature",
++ "features/embed_filters.feature",
++ "features/frontmatter_defaults.feature",
++ "features/hooks.feature",
++ "features/include_tag.feature",
++ "features/incremental_rebuild.feature",
++ "features/layout_data.feature",
++ "features/markdown.feature",
++ "features/pagination.feature",
++ "features/permalinks.feature",
++ "features/plugins.feature",
++ "features/post_data.feature",
++ "features/post_excerpts.feature",
++ "features/rendering.feature",
++ "features/site_configuration.feature",
++ "features/site_data.feature",
++ "features/step_definitions.rb",
++ "features/support/formatter.rb",
++ "features/support/helpers.rb",
++ "jekyll.gemspec",
++ "jekyll.gemspec.rej",
++ "lib/jekyll.rb",
++ "lib/jekyll/cleaner.rb",
++ "lib/jekyll/collection.rb",
++ "lib/jekyll/command.rb",
++ "lib/jekyll/commands/build.rb",
++ "lib/jekyll/commands/clean.rb",
++ "lib/jekyll/commands/doctor.rb",
++ "lib/jekyll/commands/help.rb",
++ "lib/jekyll/commands/new.rb",
++ "lib/jekyll/commands/serve.rb",
++ "lib/jekyll/commands/serve/servlet.rb",
++ "lib/jekyll/configuration.rb",
++ "lib/jekyll/converter.rb",
++ "lib/jekyll/converters/identity.rb",
++ "lib/jekyll/converters/markdown.rb",
++ "lib/jekyll/converters/markdown/kramdown_parser.rb",
++ "lib/jekyll/converters/markdown/rdiscount_parser.rb",
++ "lib/jekyll/converters/markdown/redcarpet_parser.rb",
++ "lib/jekyll/converters/smartypants.rb",
++ "lib/jekyll/convertible.rb",
++ "lib/jekyll/deprecator.rb",
++ "lib/jekyll/document.rb",
++ "lib/jekyll/drops/collection_drop.rb",
++ "lib/jekyll/drops/document_drop.rb",
++ "lib/jekyll/drops/drop.rb",
++ "lib/jekyll/drops/excerpt_drop.rb",
++ "lib/jekyll/drops/jekyll_drop.rb",
++ "lib/jekyll/drops/site_drop.rb",
++ "lib/jekyll/drops/unified_payload_drop.rb",
++ "lib/jekyll/drops/url_drop.rb",
++ "lib/jekyll/entry_filter.rb",
++ "lib/jekyll/errors.rb",
++ "lib/jekyll/excerpt.rb",
++ "lib/jekyll/external.rb",
++ "lib/jekyll/filters.rb",
++ "lib/jekyll/frontmatter_defaults.rb",
++ "lib/jekyll/generator.rb",
++ "lib/jekyll/hooks.rb",
++ "lib/jekyll/layout.rb",
++ "lib/jekyll/liquid_extensions.rb",
++ "lib/jekyll/liquid_renderer.rb",
++ "lib/jekyll/liquid_renderer/file.rb",
++ "lib/jekyll/liquid_renderer/table.rb",
++ "lib/jekyll/log_adapter.rb",
++ "lib/jekyll/mime.types",
++ "lib/jekyll/page.rb",
++ "lib/jekyll/plugin.rb",
++ "lib/jekyll/plugin_manager.rb",
++ "lib/jekyll/publisher.rb",
++ "lib/jekyll/reader.rb",
++ "lib/jekyll/readers/collection_reader.rb",
++ "lib/jekyll/readers/data_reader.rb",
++ "lib/jekyll/readers/layout_reader.rb",
++ "lib/jekyll/readers/page_reader.rb",
++ "lib/jekyll/readers/post_reader.rb",
++ "lib/jekyll/readers/static_file_reader.rb",
++ "lib/jekyll/regenerator.rb",
++ "lib/jekyll/related_posts.rb",
++ "lib/jekyll/renderer.rb",
++ "lib/jekyll/site.rb",
++ "lib/jekyll/static_file.rb",
++ "lib/jekyll/stevenson.rb",
++ "lib/jekyll/tags/highlight.rb",
++ "lib/jekyll/tags/include.rb",
++ "lib/jekyll/tags/post_url.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",
++ "rake/docs.rake",
++ "rake/release.rake",
++ "rake/site.rake",
++ "script/bootstrap",
++ "script/branding",
++ "script/cibuild",
++ "script/console",
++ "script/cucumber",
++ "script/proof",
++ "script/rubyprof",
++ "script/stackprof",
++ "script/test",
++ "script/travis",
++ "script/vendor-mimes",
++ "site/CNAME",
++ "site/README.md",
++ "site/_config.yml",
++ "site/_data/docs.yml",
++ "site/_docs/assets.md",
++ "site/_docs/collections.md",
++ "site/_docs/conduct.md",
++ "site/_docs/configuration.md",
++ "site/_docs/continuous-integration.md",
++ "site/_docs/contributing.md",
++ "site/_docs/datafiles.md",
++ "site/_docs/deployment-methods.md",
++ "site/_docs/drafts.md",
++ "site/_docs/extras.md",
++ "site/_docs/frontmatter.md",
++ "site/_docs/github-pages.md",
++ "site/_docs/history.md",
++ "site/_docs/index.md",
++ "site/_docs/installation.md",
++ "site/_docs/migrations.md",
++ "site/_docs/pages.md",
++ "site/_docs/pagination.md",
++ "site/_docs/permalinks.md",
++ "site/_docs/plugins.md",
++ "site/_docs/posts.md",
++ "site/_docs/quickstart.md",
++ "site/_docs/resources.md",
++ "site/_docs/sites.md",
++ "site/_docs/static_files.md",
++ "site/_docs/structure.md",
++ "site/_docs/templates.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",
++ "site/_docs/windows.md",
++ "site/_includes/analytics.html",
++ "site/_includes/anchor_links.html",
++ "site/_includes/docs_contents.html",
++ "site/_includes/docs_contents_mobile.html",
++ "site/_includes/docs_option.html",
++ "site/_includes/docs_ul.html",
++ "site/_includes/footer.html",
++ "site/_includes/header.html",
++ "site/_includes/news_contents.html",
++ "site/_includes/news_contents_mobile.html",
++ "site/_includes/news_item.html",
++ "site/_includes/primary-nav-items.html",
++ "site/_includes/section_nav.html",
++ "site/_includes/top.html",
++ "site/_layouts/default.html",
++ "site/_layouts/docs.html",
++ "site/_layouts/news.html",
++ "site/_layouts/news_item.html",
++ "site/_layouts/page.html",
++ "site/_posts/2013-05-06-jekyll-1-0-0-released.markdown",
++ "site/_posts/2013-05-08-jekyll-1-0-1-released.markdown",
++ "site/_posts/2013-05-12-jekyll-1-0-2-released.markdown",
++ "site/_posts/2013-06-07-jekyll-1-0-3-released.markdown",
++ "site/_posts/2013-07-14-jekyll-1-1-0-released.markdown",
++ "site/_posts/2013-07-24-jekyll-1-1-1-released.markdown",
++ "site/_posts/2013-07-25-jekyll-1-0-4-released.markdown",
++ "site/_posts/2013-07-25-jekyll-1-1-2-released.markdown",
++ "site/_posts/2013-09-06-jekyll-1-2-0-released.markdown",
++ "site/_posts/2013-09-14-jekyll-1-2-1-released.markdown",
++ "site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown",
++ "site/_posts/2013-11-04-jekyll-1-3-0-released.markdown",
++ "site/_posts/2013-11-26-jekyll-1-3-1-released.markdown",
++ "site/_posts/2013-12-07-jekyll-1-4-0-released.markdown",
++ "site/_posts/2013-12-09-jekyll-1-4-1-released.markdown",
++ "site/_posts/2013-12-16-jekyll-1-4-2-released.markdown",
++ "site/_posts/2014-01-13-jekyll-1-4-3-released.markdown",
++ "site/_posts/2014-03-24-jekyll-1-5-0-released.markdown",
++ "site/_posts/2014-03-27-jekyll-1-5-1-released.markdown",
++ "site/_posts/2014-05-06-jekyll-turns-2-0-0.markdown",
++ "site/_posts/2014-05-08-jekyll-2-0-3-released.markdown",
++ "site/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown",
++ "site/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown",
++ "site/_posts/2014-07-01-jekyll-2-1-1-released.markdown",
++ "site/_posts/2014-07-29-jekyll-2-2-0-released.markdown",
++ "site/_posts/2014-08-10-jekyll-2-3-0-released.markdown",
++ "site/_posts/2014-09-09-jekyll-2-4-0-released.markdown",
++ "site/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown",
++ "site/_posts/2014-11-08-jekyll-2-5-1-released.markdown",
++ "site/_posts/2014-11-12-jekyll-2-5-2-released.markdown",
++ "site/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md",
++ "site/_posts/2014-12-22-jekyll-2-5-3-released.markdown",
++ "site/_posts/2015-01-20-jekyll-meet-and-greet.markdown",
++ "site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown",
++ "site/_posts/2015-02-26-introducing-jekyll-talk.markdown",
++ "site/_posts/2015-10-26-jekyll-3-0-released.markdown",
++ "site/_posts/2015-11-17-jekyll-3-0-1-released.markdown",
++ "site/_posts/2016-01-20-jekyll-3-0-2-released.markdown",
++ "site/_posts/2016-01-24-jekyll-3-1-0-released.markdown",
++ "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/_sass/_font-awesome.scss",
++ "site/_sass/_gridism.scss",
++ "site/_sass/_mixins.scss",
++ "site/_sass/_pygments.scss",
++ "site/_sass/_style.scss",
++ "site/css/screen.scss",
++ "site/favicon.ico",
++ "site/fonts/fontawesome-webfont.eot",
++ "site/fonts/fontawesome-webfont.svg",
++ "site/fonts/fontawesome-webfont.ttf",
++ "site/fonts/fontawesome-webfont.woff",
++ "site/fonts/fontawesome-webfont.woff2",
++ "site/freenode.txt",
++ "site/help/index.md",
++ "site/img/article-footer.png",
++ "site/img/footer-arrow.png",
++ "site/img/footer-logo.png",
++ "site/img/jekyll-sticker.jpg",
++ "site/img/logo-2x.png",
++ "site/img/logo-rss.png",
++ "site/img/octojekyll.png",
++ "site/index.html",
++ "site/latest_version.txt",
++ "site/news/index.html",
++ "site/news/releases/index.html",
++ "site/redirects/github.html",
++ "site/redirects/issues.html",
++ "test/fixtures/broken_front_matter1.erb",
++ "test/fixtures/broken_front_matter2.erb",
++ "test/fixtures/broken_front_matter3.erb",
++ "test/fixtures/empty_permalink.erb",
++ "test/fixtures/exploit_front_matter.erb",
++ "test/fixtures/front_matter.erb",
++ "test/helper.rb",
++ "test/safe_glob_test[/find_me.txt",
++ "test/simplecov_custom_profile.rb",
++ "test/source/+/%# +.md",
++ "test/source/+/foo.md",
++ "test/source/_config.dev.toml",
++ "test/source/_data/categories/dairy.yaml",
++ "test/source/_data/languages.yml",
++ "test/source/_data/members.json",
++ "test/source/_data/members.yaml",
++ "test/source/_data/products.yml",
++ "test/source/_drafts/draft-properties.text",
++ "test/source/_includes/include.html",
++ "test/source/_includes/params.html",
++ "test/source/_includes/sig.markdown",
++ "test/source/_includes_custom/custom.html",
++ "test/source/_layouts/default.html",
++ "test/source/_layouts/post/simple.html",
++ "test/source/_layouts/simple.html",
++ "test/source/_methods/_do_not_read_me.md",
++ "test/source/_methods/configuration.md",
++ "test/source/_methods/escape-+ #%20[].md",
++ "test/source/_methods/sanitized_path.md",
++ "test/source/_methods/site/_dont_include_me_either.md",
++ "test/source/_methods/site/generate.md",
++ "test/source/_methods/site/initialize.md",
++ "test/source/_methods/um_hi.md",
++ "test/source/_methods/yaml_with_dots.md",
++ "test/source/_plugins/dummy.rb",
++ "test/source/_posts/2008-02-02-not-published.markdown",
++ "test/source/_posts/2008-02-02-published.markdown",
++ "test/source/_posts/2008-10-18-foo-bar.markdown",
++ "test/source/_posts/2008-11-21-complex.markdown",
++ "test/source/_posts/2008-12-03-permalinked-post.markdown",
++ "test/source/_posts/2008-12-13-include.markdown",
++ "test/source/_posts/2009-01-27-array-categories.markdown",
++ "test/source/_posts/2009-01-27-categories.markdown",
++ "test/source/_posts/2009-01-27-category.markdown",
++ "test/source/_posts/2009-01-27-empty-categories.markdown",
++ "test/source/_posts/2009-01-27-empty-category.markdown",
++ "test/source/_posts/2009-01-27-no-category.markdown",
++ "test/source/_posts/2009-03-12-hash-#1.markdown",
++ "test/source/_posts/2009-05-18-empty-tag.markdown",
++ "test/source/_posts/2009-05-18-empty-tags.markdown",
++ "test/source/_posts/2009-05-18-tag.markdown",
++ "test/source/_posts/2009-05-18-tags.markdown",
++ "test/source/_posts/2009-06-22-empty-yaml.markdown",
++ "test/source/_posts/2009-06-22-no-yaml.markdown",
++ "test/source/_posts/2010-01-08-triple-dash.markdown",
++ "test/source/_posts/2010-01-09-date-override.markdown",
++ "test/source/_posts/2010-01-09-time-override.markdown",
++ "test/source/_posts/2010-01-09-timezone-override.markdown",
++ "test/source/_posts/2010-01-16-override-data.markdown",
++ "test/source/_posts/2011-04-12-md-extension.md",
++ "test/source/_posts/2011-04-12-text-extension.text",
++ "test/source/_posts/2013-01-02-post-excerpt.markdown",
++ "test/source/_posts/2013-01-12-nil-layout.markdown",
++ "test/source/_posts/2013-01-12-no-layout.markdown",
++ "test/source/_posts/2013-04-11-custom-excerpt.markdown",
++ "test/source/_posts/2013-05-10-number-category.markdown",
++ "test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown",
++ "test/source/_posts/2013-08-01-mkdn-extension.mkdn",
++ "test/source/_posts/2013-12-17-include-variable-filters.markdown",
++ "test/source/_posts/2013-12-20-properties.text",
++ "test/source/_posts/2014-01-06-permalink-traversal.md",
++ "test/source/_posts/2014-03-03-yaml-with-dots.md",
++ "test/source/_posts/2014-03-22-escape-+ %20[].markdown",
++ "test/source/_posts/2014-07-05-another-mixed-case-category.markdown",
++ "test/source/_posts/2014-07-05-mixed-case-category.markdown",
++ "test/source/_posts/2014-09-02-relative-includes.markdown",
++ "test/source/_posts/2014-11-24-Rmd-extension.Rmd",
++ "test/source/_posts/2015-01-08-post-excerpt-separator.markdown",
++ "test/source/_posts/2015-02-20-extensionless-permalink.markdown",
++ "test/source/_posts/2015-12-27-extra-spaces.markdown",
++ "test/source/_posts/es/2008-11-21-nested.markdown",
++ "test/source/_posts/include_relative/params.html",
++ "test/source/_posts/include_relative/rel_include.html",
++ "test/source/_sass/_grid.scss",
++ "test/source/_slides/example-slide-1.html",
++ "test/source/_slides/example-slide-2.html",
++ "test/source/_slides/example-slide-3.html",
++ "test/source/_slides/example-slide-4.html",
++ "test/source/_slides/example-slide-5.html",
++ "test/source/_slides/example-slide-6.html",
++ "test/source/_slides/example-slide-7.md",
++ "test/source/_slides/example-slide-Upper-Cased.html",
++ "test/source/_slides/non-outputted-slide.html",
++ "test/source/_slides/octojekyll.png",
++ "test/source/_thanksgiving/2015-11-26-thanksgiving.md",
++ "test/source/_thanksgiving/black-friday.md",
++ "test/source/_urls_differ_by_case_invalid/page1.html",
++ "test/source/_urls_differ_by_case_invalid/page2.html",
++ "test/source/_urls_differ_by_case_valid/page1.html",
++ "test/source/_with.dots/all.dots/2.4.0.md",
++ "test/source/_with.dots/file.with.dots.md",
++ "test/source/_with.dots/mit.txt",
++ "test/source/_with.dots/permalink.with.slash.tho.md",
++ "test/source/about.html",
++ "test/source/category/_posts/2008-9-23-categories.markdown",
++ "test/source/contacts.html",
++ "test/source/contacts/bar.html",
++ "test/source/contacts/humans.txt",
++ "test/source/contacts/index.html",
++ "test/source/css/main.scss",
++ "test/source/css/screen.css",
++ "test/source/deal.with.dots.html",
++ "test/source/dynamic_file.php",
++ "test/source/environment.html",
++ "test/source/exploit.md",
++ "test/source/foo/_posts/bar/2008-12-12-topical-post.markdown",
++ "test/source/index.html",
++ "test/source/js/coffeescript.coffee",
++ "test/source/pgp.key",
++ "test/source/products.yml",
++ "test/source/properties.html",
++ "test/source/sitemap.xml",
++ "test/source/static_files.html",
++ "test/source/symlink-test/symlinked-file",
++ "test/source/unpublished.html",
++ "test/source/win/_posts/2009-05-24-yaml-linebreak.markdown",
++ "test/source/z_category/_posts/2008-9-23-categories.markdown",
++ "test/test_ansi.rb",
++ "test/test_cleaner.rb",
++ "test/test_coffeescript.rb",
++ "test/test_collections.rb",
++ "test/test_command.rb",
++ "test/test_commands_serve.rb",
++ "test/test_configuration.rb",
++ "test/test_convertible.rb",
++ "test/test_doctor_command.rb",
++ "test/test_document.rb",
++ "test/test_entry_filter.rb",
++ "test/test_excerpt.rb",
++ "test/test_excerpt_drop.rb",
++ "test/test_filters.rb",
++ "test/test_front_matter_defaults.rb",
++ "test/test_generated_site.rb",
++ "test/test_kramdown.rb",
++ "test/test_layout_reader.rb",
++ "test/test_liquid_extensions.rb",
++ "test/test_liquid_renderer.rb",
++ "test/test_log_adapter.rb",
++ "test/test_new_command.rb",
++ "test/test_page.rb",
++ "test/test_path_sanitization.rb",
++ "test/test_plugin_manager.rb",
++ "test/test_rdiscount.rb",
++ "test/test_redcarpet.rb",
++ "test/test_regenerator.rb",
++ "test/test_related_posts.rb",
++ "test/test_sass.rb",
++ "test/test_site.rb",
++ "test/test_static_file.rb",
++ "test/test_tags.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']
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 eaebe7b..c509a90 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>
-Date: Sun, 27 Dec 2015 23:44:31 +0900
+Last-Update: 2016-06-05
Subject: Remove relative LOAD_PATH from bin/jekyll
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
@@ -7,15 +7,13 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
bin/jekyll | 2 --
1 file changed, 2 deletions(-)
-diff --git a/bin/jekyll b/bin/jekyll
-index 67705b5..7a8e635 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -1,8 +1,6 @@
#!/usr/bin/env ruby
STDOUT.sync = true
--$:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
+-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
-
require 'jekyll'
require 'mercenary'
--
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