[DRE-commits] [gitlab] 01/01: relax net-ssh

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab.

commit 2a885bfef031c2a0a7fd4b31a899a8259fcb6e6a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jan 28 02:02:33 2016 +0530

    relax net-ssh
---
 debian/changelog                        |  7 +++++++
 debian/control                          |  2 +-
 debian/patches/0038-relax-net-ssh.patch | 13 +++++++++++++
 debian/patches/series                   |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7df5116..03334dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gitlab (8.4.0+dfsg~rc2-4) unstable; urgency=medium
+
+  * Reupload to unstable
+  * Relax ruby-net-ssh dependency
+
+ -- Pirate Praveen <praveen at debian.org>  Thu, 28 Jan 2016 02:01:57 +0530
+
 gitlab (8.4.0+dfsg~rc2-3) experimental; urgency=medium
 
   * Read gitlab-debian.conf from /etc/default/gitlab
diff --git a/debian/control b/debian/control
index 16643bd..2b3c759 100644
--- a/debian/control
+++ b/debian/control
@@ -175,7 +175,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-request-store (>= 1.1~),
  ruby-select2-rails (>= 3.5.9~),
  ruby-virtus (>= 1.0.1~),
- ruby-net-ssh (>= 3.0.1~),
+ ruby-net-ssh (>= 2.9.2~),
 # Metrics
  ruby-allocations (>= 1.0~),
  ruby-method-source (>= 0.8~),
diff --git a/debian/patches/0038-relax-net-ssh.patch b/debian/patches/0038-relax-net-ssh.patch
new file mode 100644
index 0000000..c7c7c9e
--- /dev/null
+++ b/debian/patches/0038-relax-net-ssh.patch
@@ -0,0 +1,13 @@
+Index: gitlab/Gemfile
+===================================================================
+--- gitlab.orig/Gemfile
++++ gitlab/Gemfile
+@@ -210,7 +210,7 @@ gem 'raphael-rails',      '~> 2.1.2'
+ gem 'request_store',      '~> 1.1'
+ gem 'select2-rails',      '~> 3.5.9'
+ gem 'virtus',             '~> 1.0.1'
+-gem 'net-ssh',            '~> 3.0.1'
++gem 'net-ssh',            '>= 2.9.2'
+ 
+ # Metrics
+ group :metrics do
diff --git a/debian/patches/series b/debian/patches/series
index 890c618..f37adbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ loosen-rails-version.patch
 0020-loosen-unicorn.patch
 0028-loosen-ace-rails-ap.patch
 0037-loosen-request-store.patch
+0038-relax-net-ssh.patch
 0100-remove-development-test.patch
 0102-loosen-octokit.patch
 0107-relax-omniauth-facebook.patch

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