[DRE-commits] [gitlab] 03/04: relax more dependencies

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master-9.2
in repository gitlab.

commit b7803bead151c6ade1d878c6bd97b97e1179adf4
Author: Pirate Praveen <praveen at debian.org>
Date:   Sun Aug 20 00:17:22 2017 +0530

    relax more dependencies
---
 debian/patches/0110-make-test-dependencies-conditional.patch | 12 ++++++++++++
 debian/patches/0220-relax-dependencies.patch                 |  2 +-
 debian/patches/0270-relax-toml-rb.patch                      |  8 ++++++++
 debian/patches/series                                        |  2 ++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0110-make-test-dependencies-conditional.patch b/debian/patches/0110-make-test-dependencies-conditional.patch
new file mode 100644
index 0000000..bd88d13
--- /dev/null
+++ b/debian/patches/0110-make-test-dependencies-conditional.patch
@@ -0,0 +1,12 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -273,7 +273,8 @@
+   gem 'influxdb', '~> 0.2', require: false
+ end
+ 
+-group :test do
++#group :test do
++if ENV["INCLUDE_TEST_DEPENDS"] == "true"
+   gem 'shoulda-matchers', '~> 2.8', require: false
+   gem 'email_spec', '~> 1.6'
+   gem 'json-schema', '~> 2.6', '>= 2.6.2'
diff --git a/debian/patches/0220-relax-dependencies.patch b/debian/patches/0220-relax-dependencies.patch
index 5356e69..6a2ab70 100644
--- a/debian/patches/0220-relax-dependencies.patch
+++ b/debian/patches/0220-relax-dependencies.patch
@@ -9,7 +9,7 @@
  gem 'base32', '~> 0.3.0'
  
  # Sentry integration
-@@ -277,7 +277,7 @@
+@@ -278,7 +278,7 @@
    gem 'shoulda-matchers', '~> 2.8', require: false
    gem 'email_spec', '~> 1.6'
    gem 'json-schema', '~> 2.6', '>= 2.6.2'
diff --git a/debian/patches/0270-relax-toml-rb.patch b/debian/patches/0270-relax-toml-rb.patch
new file mode 100644
index 0000000..632d50b
--- /dev/null
+++ b/debian/patches/0270-relax-toml-rb.patch
@@ -0,0 +1,8 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -310,4 +310,4 @@
+ # Gitaly GRPC client
+ gem 'gitaly', '~> 0.6.0'
+ 
+-gem 'toml-rb', '~> 0.3.15', require: false
++gem 'toml-rb', '>= 0.3.15', require: false
diff --git a/debian/patches/series b/debian/patches/series
index 62695a8..c461ae5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
 0050-relax-stable-libs.patch
 0100-remove-development-test.patch
 0108-make-mysql-optional.patch
+0110-make-test-dependencies-conditional.patch
 source-init-functions.patch
 pid-log-paths.patch
 0200-remove-order-dependency-in-label-finder-spec.patch
@@ -10,3 +11,4 @@ pid-log-paths.patch
 0240-relax-google-api-client.patch
 0250-relax-licensee.patch
 0260-relax-ruby-parser.patch
+0270-relax-toml-rb.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git