diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch index f2b1ed6c9f..3c4008ff0c 100644 --- a/debian/patches/0050-relax-stable-libs.patch +++ b/debian/patches/0050-relax-stable-libs.patch @@ -162,10 +162,10 @@ gitlab Gemfile +gem 'gitlab-markup', '~> 1.7', '>= 1.7.1' +gem 'github-markup', '~> 1.7', require: 'github/markup' gem 'commonmarker', '~> 0.20' --gem 'kramdown', '~> 2.2.1' +-gem 'kramdown', '~> 2.3.0' -gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 6.1.2' -+gem 'kramdown', '~> 2.2', '>= 2.2.1' ++gem 'kramdown', '~> 2.3' +gem 'RedCloth', '~> 4.3', '>= 4.3.2' +gem 'rdoc', '~> 6.1', '>= 6.1.2' gem 'org-ruby', '~> 0.9.12' diff --git a/debian/patches/0350-relax-rdoc.patch b/debian/patches/0350-relax-rdoc.patch index fdfe2ff1d3..f5e12003cf 100644 --- a/debian/patches/0350-relax-rdoc.patch +++ b/debian/patches/0350-relax-rdoc.patch @@ -4,7 +4,7 @@ Allow rdoc from ruby 2.5 to match requirement +++ b/Gemfile @@ -143,7 +143,7 @@ gem 'commonmarker', '~> 0.20' - gem 'kramdown', '~> 2.2', '>= 2.2.1' + gem 'kramdown', '~> 2.3' gem 'RedCloth', '~> 4.3', '>= 4.3.2' -gem 'rdoc', '~> 6.1', '>= 6.1.2' +gem 'rdoc', '~> 6.0' diff --git a/debian/patches/0430-remove-gitlab-markup.patch b/debian/patches/0430-remove-gitlab-markup.patch index 7ca4b56ef2..62fc3963e4 100644 --- a/debian/patches/0430-remove-gitlab-markup.patch +++ b/debian/patches/0430-remove-gitlab-markup.patch @@ -11,4 +11,4 @@ maintaining two almost same packages. -gem 'gitlab-markup', '~> 1.7', '>= 1.7.1' gem 'github-markup', '~> 1.7', require: 'github/markup' gem 'commonmarker', '~> 0.20' - gem 'kramdown', '~> 2.2', '>= 2.2.1' + gem 'kramdown', '~> 2.3'