diff --git a/debian/changelog b/debian/changelog index 7df5116ae1..03334dc85f 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 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 16643bdd70..2b3c75937b 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 0000000000..c7c7c9e09c --- /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 890c618c3b..f37adbbc2b 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