[DRE-commits] [redmine] 24/26: redmine-mysql: use ruby-mysql2 instead of ruby-mysql

[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 53a83162baa3b17bdc0cacc33e89902697f174be
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Sep 14 14:17:47 2014 -0300

    redmine-mysql: use ruby-mysql2 instead of ruby-mysql
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/postinst  | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fb8fec9..90c6256 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ redmine (3.0~20140825-1) UNRELEASED; urgency=medium
   * debian/patches/gemfile-adjustments.patch: make adjustments to version
     expectations; some of them are too strict
   * Add smoke test as autopkgtest test suite.
+  * redmine-mysql: use ruby-mysql2 instead of ruby-mysql
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 25 Aug 2014 21:04:18 -0300
 
diff --git a/debian/control b/debian/control
index e75fb23..0635719 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Description: flexible project management web application
 
 Package: redmine-mysql
 Architecture: all
-Depends: ruby-mysql (>= 2.8.1),
+Depends: ruby-mysql2,
  mysql-client | virtual-mysql-client,
  ${misc:Depends}
 Recommends: redmine (= ${source:Version})
diff --git a/debian/postinst b/debian/postinst
index 4580695..f6f17a7 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -188,12 +188,15 @@ for lInstance in $gInstances; do
 		ucf --purge $fYml
 		
 		if [ -e $fYml ]; then
-			hasdb=$(grep -m 1 -o -E 'adapter: (mysql|pgsql|sqlite3|postgresql)' $fYml) || true
+			hasdb=$(grep -m 1 -o -E 'adapter: (mysql|mysql2|pgsql|sqlite3|postgresql)' $fYml) || true
 			if [ -n "$hasdb" ]; then
 				hasdb=$(echo -n ${hasdb#*:})
 				withdb=1
 				case "$hasdb" in
-					mysql|postgresql|pgsql)
+					mysql)
+						sed -i -r -e 's/mysql/mysql2/g' $fYml
+						;;
+					postgresql|pgsql)
 						sed -i -r -e 's/pgsql/postgresql/g' $fYml
 					;;
 					sqlite3)

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