From 56135374874818cc3c10c08f40829478da9ffda0 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Fri, 28 Nov 2014 12:24:21 +1300 Subject: [PATCH] Bug 13359 - allow the packages to use virtual-mysql-* Prior to this patch, the koha packages depended on mysql-client. This meant that it was tricky to use things such as the MariaDB libraries instead. This patch recommends mysql, but will accept mariadb and other things that are marked by debian as able to replace mysql. Signed-off-by: wajasu Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 9419177a1e39296fe1049b44fb9788eeb4341b77) Signed-off-by: Chris Cormack --- debian/control | 10 +++++----- debian/control.in | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/control b/debian/control index 8c378c1eb1..3e8150d811 100644 --- a/debian/control +++ b/debian/control @@ -139,7 +139,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, idzebra-2.0, libjs-jquery, libjs-yui, - mysql-client, + mysql-client | virtual-mysql-client, perl-doc, pwgen, sudo, @@ -148,7 +148,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, unzip, xmlstarlet, yaz -Suggests: mysql-server, +Suggests: mysql-server | virtual-mysql-server, memcached Homepage: http://koha-community.org/ Description: integrated (physical) library management system @@ -163,7 +163,7 @@ Architecture: all Depends: ${shlib:Depends}, ${misc:Depends}, koha-common, dbconfig-common, - mysql-server + mysql-server | virtual-mysql-server Homepage: http://koha-community.org/ Description: integrated (physical) library management system Koha is an Integrated Library Managment system for real-world libraries @@ -187,8 +187,8 @@ Depends: ${misc:Depends}, idzebra-2.0, libjs-jquery, libjs-yui, - mysql-client, - mysql-server, + mysql-client | virtual-mysql-client, + mysql-server | virtual-mysql-server, perl-doc, pwgen, sudo, diff --git a/debian/control.in b/debian/control.in index 3c2f42f443..66ebc4c35c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -25,7 +25,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, idzebra-2.0, libjs-jquery, libjs-yui, - mysql-client, + mysql-client | virtual-mysql-client, perl-doc, pwgen, sudo, @@ -34,7 +34,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, unzip, xmlstarlet, yaz -Suggests: mysql-server, +Suggests: mysql-server | virtual-mysql-server, memcached Homepage: http://koha-community.org/ Description: integrated (physical) library management system @@ -49,7 +49,7 @@ Architecture: all Depends: ${shlib:Depends}, ${misc:Depends}, koha-common, dbconfig-common, - mysql-server + mysql-server | virtual-mysql-server Homepage: http://koha-community.org/ Description: integrated (physical) library management system Koha is an Integrated Library Managment system for real-world libraries @@ -73,8 +73,8 @@ Depends: ${misc:Depends}, idzebra-2.0, libjs-jquery, libjs-yui, - mysql-client, - mysql-server, + mysql-client | virtual-mysql-client, + mysql-server | virtual-mysql-server, perl-doc, pwgen, sudo, -- 2.39.5