From b9f2d2556114806f8e8ac0142c631698fe00412e Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 22 Feb 2018 23:59:30 +0530 Subject: [PATCH] relax dependencies --- debian/patches/0360-relax-rdoc.patch | 11 +++++++++++ debian/patches/0370-relax-prof.patch | 11 +++++++++++ debian/patches/series | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 debian/patches/0360-relax-rdoc.patch create mode 100644 debian/patches/0370-relax-prof.patch diff --git a/debian/patches/0360-relax-rdoc.patch b/debian/patches/0360-relax-rdoc.patch new file mode 100644 index 0000000000..88522080f3 --- /dev/null +++ b/debian/patches/0360-relax-rdoc.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -120,7 +120,7 @@ + gem 'gitlab-markup', '~> 1.5', '>= 1.5.1' + gem 'redcarpet', '~> 3.4' + gem 'RedCloth', '~> 4.3', '>= 4.3.2' +-gem 'rdoc', '~> 4.2' ++gem 'rdoc', '>= 4.2' + gem 'org-ruby', '~> 0.9.12' + gem 'creole', '~> 0.5.0' + gem 'wikicloth', '0.8.1' diff --git a/debian/patches/0370-relax-prof.patch b/debian/patches/0370-relax-prof.patch new file mode 100644 index 0000000000..c465f22688 --- /dev/null +++ b/debian/patches/0370-relax-prof.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -356,7 +356,7 @@ + gem 'email_reply_trimmer', '~> 0.1' + gem 'html2text' + +-gem 'ruby-prof', '~> 0.16.2' ++gem 'ruby-prof', '~> 0.16' + + # OAuth + gem 'oauth2', '~> 1.4' diff --git a/debian/patches/series b/debian/patches/series index dee7504efd..b3d523ff88 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,6 +17,8 @@ pid-log-paths.patch 0330-relax-acts-as-taggable-on.patch 0340-relax-httparty.patch 0350-relax-oj.patch +0360-relax-rdoc.patch +0370-relax-prof.patch 0410-set-webpack-root.patch 0420-use-system-libs.patch add-system-lib-path-for-webpack.patch