Version in base suite: 3.8.3+dfsg-4 Base version: jekyll_3.8.3+dfsg-4 Target version: jekyll_3.8.3+dfsg-4+deb10u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/j/jekyll/jekyll_3.8.3+dfsg-4.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/j/jekyll/jekyll_3.8.3+dfsg-4+deb10u1.dsc .gitignore | 1 changelog | 10 ++++++ control | 2 - patches/0017-allow-jekyll-to-run-with-ruby-i18n-1.x.patch | 23 ++++++++++++++ patches/series | 1 5 files changed, 35 insertions(+), 2 deletions(-) diff: /srv/release.debian.org/tmp/rHH3MiKuK_/jekyll-3.8.3+dfsg/test/source/_includes/tmp: No such file or directory diff: /srv/release.debian.org/tmp/0CJSfJG3ZS/jekyll-3.8.3+dfsg/test/source/_includes/tmp: No such file or directory diff -Nru jekyll-3.8.3+dfsg/debian/.gitignore jekyll-3.8.3+dfsg/debian/.gitignore --- jekyll-3.8.3+dfsg/debian/.gitignore 2019-02-13 02:40:42.000000000 +0000 +++ jekyll-3.8.3+dfsg/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -!node_modules diff -Nru jekyll-3.8.3+dfsg/debian/changelog jekyll-3.8.3+dfsg/debian/changelog --- jekyll-3.8.3+dfsg/debian/changelog 2019-03-16 10:33:25.000000000 +0000 +++ jekyll-3.8.3+dfsg/debian/changelog 2020-04-21 13:20:38.000000000 +0000 @@ -1,3 +1,13 @@ +jekyll (3.8.3+dfsg-4+deb10u1) buster; urgency=medium + + * Team upload. + * d/control (Vcs-Git): Add branch information. + * d/patches/0017-allow-jekyll-to-run-with-ruby-i18n-1.x.patch: Add patch. + - Allow ruby-i18n 0.x and 1.x (closes: #948215). + * d/patches/series: Add patch. + + -- Daniel Leidert Tue, 21 Apr 2020 15:20:38 +0200 + jekyll (3.8.3+dfsg-4) unstable; urgency=medium * d/control: Add bundler to Depends (Closes: #924230) diff -Nru jekyll-3.8.3+dfsg/debian/control jekyll-3.8.3+dfsg/debian/control --- jekyll-3.8.3+dfsg/debian/control 2019-03-16 10:11:14.000000000 +0000 +++ jekyll-3.8.3+dfsg/debian/control 2020-04-21 13:20:38.000000000 +0000 @@ -45,7 +45,7 @@ webpack Standards-Version: 4.2.0 Vcs-Browser: https://salsa.debian.org/ruby-team/jekyll -Vcs-Git: https://salsa.debian.org/ruby-team/jekyll.git +Vcs-Git: https://salsa.debian.org/ruby-team/jekyll.git -b debian/buster Homepage: https://github.com/mojombo/jekyll Testsuite: autopkgtest-pkg-ruby XS-Ruby-Versions: all diff -Nru jekyll-3.8.3+dfsg/debian/patches/0017-allow-jekyll-to-run-with-ruby-i18n-1.x.patch jekyll-3.8.3+dfsg/debian/patches/0017-allow-jekyll-to-run-with-ruby-i18n-1.x.patch --- jekyll-3.8.3+dfsg/debian/patches/0017-allow-jekyll-to-run-with-ruby-i18n-1.x.patch 1970-01-01 00:00:00.000000000 +0000 +++ jekyll-3.8.3+dfsg/debian/patches/0017-allow-jekyll-to-run-with-ruby-i18n-1.x.patch 2020-04-21 13:20:38.000000000 +0000 @@ -0,0 +1,23 @@ +From: Daniel Leidert +Date: Sun, 5 Jan 2020 14:41:21 +0100 +Subject: Allow jekyll to run with ruby-i18n 1.x + +Bug-Debian: https://bugs.debian.org/948215 +Origin: https://github.com/jekyll/jekyll/pull/7044 +--- + jekyll.gemspec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jekyll.gemspec b/jekyll.gemspec +index f4c0c23..4d9feb9 100644 +--- a/jekyll.gemspec ++++ b/jekyll.gemspec +@@ -33,7 +33,7 @@ Gem::Specification.new do |s| + s.add_runtime_dependency("addressable", "~> 2.4") + s.add_runtime_dependency("colorator", "~> 1.0") + s.add_runtime_dependency("em-websocket", "~> 0.5") +- s.add_runtime_dependency("i18n", "~> 0.7") ++ s.add_runtime_dependency("i18n", ">= 0.7", "< 2") + s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0") + s.add_runtime_dependency("jekyll-watch", "~> 2.0") + s.add_runtime_dependency("kramdown", "~> 1.14") diff -Nru jekyll-3.8.3+dfsg/debian/patches/series jekyll-3.8.3+dfsg/debian/patches/series --- jekyll-3.8.3+dfsg/debian/patches/series 2019-03-16 09:13:41.000000000 +0000 +++ jekyll-3.8.3+dfsg/debian/patches/series 2020-04-21 13:20:38.000000000 +0000 @@ -3,3 +3,4 @@ 0003-Remove-relative-LOAD_PATH.patch skip-test-requiring-network-access.patch 0015-Fix-CVE-2018-17567-Closes-909933.patch +0017-allow-jekyll-to-run-with-ruby-i18n-1.x.patch