[DRE-maint] Bug#958399: debdiff

[Daniel Leidert]

Package: release.debian.org
Tags: buster
Followup-For: Bug #958399
User: release.debian.org at packages.debian.org
Usertags: pu

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

debdiff attached this time


- -- System Information:
Debian Release: bullseye/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.5.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEvu1N7VVEpMA+KD3HS80FZ8KW0F0FAl6e/YwACgkQS80FZ8KW
0F3yjw//V2h1hS+87kv1hJfDLChofQBO/SeMfKfx6c1KS1VHmwJ17CFXeGI+KIMy
PZxysKYE9VcWkGpSa3o12qvWy6Yd0LbKpuEKfy4rpRjaG/IgDrIYc2c1da0ziPXe
EHnAB+kgMdg0eqONbl3XnJ5xkTl3IhqKa7+cib+iT/8mj1SkQFgE+29eyUTQFOqP
fkiI2Rp96nU8FaVDhUOBIVFsSLZjmnGgfV4209RQeCV9qgrMgrwojvnZBYy/uuB2
qGZjp0UUbay/lSkriaKq0IL37ELDnzV3yllIn/nP4Sd7B3+qpe1ja03x02V0oNIJ
hCAGX5vheORtmy7R05owvfmV0TpNPcGCRJgJvwP9fT9ZAnVSANs8HXYoPhqHXXUF
R+iloe/FKb6yCNPId71RKTnAlhZhc3mwByy6/HHn73XtRhOOlAUkdA1YQfrQ6JQ9
80yscQ62o4Xqo0BYt63dvYfBYmgRub2jRzFebvJwCWrycU6SLgPA+KEW/7NDNZ0t
rPVtWRp8E8srMSgtFsPA3XLdYwIXSaGq4ZmSuo1oBEXqF6VpmCSAK4nEeC4RyMTS
X4RsESlvweF58pNRI2fAj05BAd4v8af6c5JgAzq5ykMWjAuu2LVu6/PBF4CpFIBd
Tdusm6kRIDmxI2rjobtbYziMMioAhkxNX75REnQicLna0Zg8aC0=
=pGYM
-----END PGP SIGNATURE-----
-------------- next part --------------
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 11:33:25.000000000 +0100
+++ jekyll-3.8.3+dfsg/debian/changelog	2020-04-21 15:20:38.000000000 +0200
@@ -1,3 +1,13 @@
+jekyll (3.8.3+dfsg-4+deb10u1) unstable; 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 <dleidert at debian.org>  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 11:11:14.000000000 +0100
+++ jekyll-3.8.3+dfsg/debian/control	2020-04-21 15:20:38.000000000 +0200
@@ -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/.gitignore jekyll-3.8.3+dfsg/debian/.gitignore
--- jekyll-3.8.3+dfsg/debian/.gitignore	2019-02-13 03:40:42.000000000 +0100
+++ jekyll-3.8.3+dfsg/debian/.gitignore	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-!node_modules
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 01:00:00.000000000 +0100
+++ jekyll-3.8.3+dfsg/debian/patches/0017-allow-jekyll-to-run-with-ruby-i18n-1.x.patch	2020-04-21 15:20:38.000000000 +0200
@@ -0,0 +1,23 @@
+From: Daniel Leidert <daniel.leidert at wgdd.de>
+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 10:13:41.000000000 +0100
+++ jekyll-3.8.3+dfsg/debian/patches/series	2020-04-21 15:20:38.000000000 +0200
@@ -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