[DRE-commits] [redmine] 01/03: 0001-Gemfile-relax-some-dependencies.patch: also relax dependency on mysql2

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository redmine.

commit e0cb887f7dfd73a7658fc4664640be2327f37d49
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Feb 25 20:16:35 2016 -0300

    0001-Gemfile-relax-some-dependencies.patch: also relax dependency on mysql2
---
 debian/changelog                                          |  7 +++++++
 debian/patches/0001-Gemfile-relax-some-dependencies.patch | 15 ++++++++++++---
 debian/patches/0004-Add-multi-tenancy-support.patch       |  2 +-
 debian/patches/0005-Assume-default-instance.patch         |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b20337..a5ed1cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+redmine (3.2.0-3) UNRELEASED; urgency=medium
+
+  * 0001-Gemfile-relax-some-dependencies.patch: also relax dependency on
+    mysql2
+
+ -- Antonio Terceiro <terceiro at debian.org>  Thu, 25 Feb 2016 20:16:02 -0300
+
 redmine (3.2.0-2) unstable; urgency=medium
 
   * Enforce dependencies on the required versions of rails and jquery-rails
diff --git a/debian/patches/0001-Gemfile-relax-some-dependencies.patch b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
index 4a5f7a8..6ab1d7d 100644
--- a/debian/patches/0001-Gemfile-relax-some-dependencies.patch
+++ b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
@@ -3,11 +3,11 @@ Date: Tue, 25 Aug 2015 18:15:22 -0300
 Subject: Gemfile: relax some dependencies
 
 ---
- Gemfile | 27 ++++++---------------------
- 1 file changed, 6 insertions(+), 21 deletions(-)
+ Gemfile | 29 +++++++----------------------
+ 1 file changed, 7 insertions(+), 22 deletions(-)
 
 diff --git a/Gemfile b/Gemfile
-index 3ad9b1e..5fe15ba 100644
+index 3ad9b1e..cb0b631 100644
 --- a/Gemfile
 +++ b/Gemfile
 @@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
@@ -49,6 +49,15 @@ index 3ad9b1e..5fe15ba 100644
    end
  end
  
+@@ -60,7 +60,7 @@ if File.exist?(database_file)
+     adapters.each do |adapter|
+       case adapter
+       when 'mysql2'
+-        gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw]
++        gem "mysql2", "~> 0.4.0", :platforms => [:mri, :mingw, :x64_mingw]
+         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+       when 'mysql'
+         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
 @@ -85,21 +85,6 @@ else
    warn("Please configure your config/database.yml first")
  end
diff --git a/debian/patches/0004-Add-multi-tenancy-support.patch b/debian/patches/0004-Add-multi-tenancy-support.patch
index 117e934..fdb2f47 100644
--- a/debian/patches/0004-Add-multi-tenancy-support.patch
+++ b/debian/patches/0004-Add-multi-tenancy-support.patch
@@ -46,7 +46,7 @@ index 173b030..d9e39ef 100644
  /lib/redmine/scm/adapters/mercurial/redminehelper.pyo
  /log/*.log*
 diff --git a/Gemfile b/Gemfile
-index 5fe15ba..4a04b1e 100644
+index cb0b631..4a46396 100644
 --- a/Gemfile
 +++ b/Gemfile
 @@ -52,7 +52,14 @@ end
diff --git a/debian/patches/0005-Assume-default-instance.patch b/debian/patches/0005-Assume-default-instance.patch
index 6b96f09..c95cd01 100644
--- a/debian/patches/0005-Assume-default-instance.patch
+++ b/debian/patches/0005-Assume-default-instance.patch
@@ -8,7 +8,7 @@ Subject: Assume default instance
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Gemfile b/Gemfile
-index 4a04b1e..9562231 100644
+index 4a46396..8839669 100644
 --- a/Gemfile
 +++ b/Gemfile
 @@ -56,7 +56,7 @@ require 'yaml'

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