adding a choice between MySQL & MariaDB for MySQL service in the dependency. Fixes #159
This commit is contained in:
parent
aaa5a68388
commit
4bc4626d14
|
@ -37,7 +37,6 @@ Depends: debianutils (>= 1.13.1)
|
|||
, gettext (>= 0.10.40-5)
|
||||
, sudo
|
||||
, adduser
|
||||
, mysql-client
|
||||
, dnsutils
|
||||
, dovecot-common (>=1:1.2.15)
|
||||
, dovecot-common(<< 1:2.0)
|
||||
|
@ -49,12 +48,12 @@ Depends: debianutils (>= 1.13.1)
|
|||
, incron
|
||||
, cron
|
||||
, opendkim
|
||||
, mysql-client(>= 5.0)
|
||||
, mysql-client(>= 5.0) | mariadb-client
|
||||
, php5-curl
|
||||
, quota
|
||||
, pwgen
|
||||
, ${misc:Depends}
|
||||
Recommends: mysql-server(>= 5.0)
|
||||
Recommends: mysql-server(>= 5.0) | mariadb-server
|
||||
, ntp
|
||||
, unzip
|
||||
, bzip2
|
||||
|
@ -123,7 +122,6 @@ Depends: debianutils (>= 1.13.1)
|
|||
, lockfile-progs (>= 0.1.9)
|
||||
, gettext (>= 0.10.40-5)
|
||||
, adduser
|
||||
, mysql-client
|
||||
, sudo
|
||||
, dovecot-common (>=1:1.2.15)
|
||||
, dovecot-common(<< 1:2.0)
|
||||
|
@ -134,7 +132,7 @@ Depends: debianutils (>= 1.13.1)
|
|||
, incron
|
||||
, cron
|
||||
, opendkim
|
||||
, mysql-client(>= 5.0)
|
||||
, mysql-client(>= 5.0) | mariadb-client
|
||||
, php5-curl
|
||||
, ${misc:Depends}
|
||||
Recommends:
|
||||
|
@ -332,7 +330,7 @@ Package: alternc-ssl
|
|||
Priority: optional
|
||||
Section: admin
|
||||
Architecture: all
|
||||
Depends: openssl, mysql-client, debconf, alternc (>= 3.0), php5-cli, ${misc:Depends}
|
||||
Depends: openssl, mysql-client | mariadb-client, debconf, alternc (>= 3.0), php5-cli, ${misc:Depends}
|
||||
Conflicts: alternc (<< 3.0)
|
||||
Description: HTTPS module for AlternC
|
||||
AlternC is a mutualized hosting software manager for Linux.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- control.wheezy 2015-12-22 12:11:43.355751408 +0100
|
||||
+++ control 2015-12-22 12:12:45.489205807 +0100
|
||||
--- debian/control 2017-08-12 17:23:26.603473696 +0200
|
||||
+++ /tmp/control.jessie 2017-08-12 17:24:48.811868407 +0200
|
||||
@@ -15,7 +15,7 @@
|
||||
, bash (>= 4)
|
||||
, acl
|
||||
|
@ -9,16 +9,21 @@
|
|||
, libapache2-mod-php5
|
||||
, php5-mysql
|
||||
, phpmyadmin
|
||||
@@ -39,7 +39,7 @@
|
||||
@@ -38,10 +38,9 @@
|
||||
, sudo
|
||||
, adduser
|
||||
, mysql-client
|
||||
, dnsutils
|
||||
- , dovecot-common (>=1:2.1.7)
|
||||
- , dovecot-common (>=1:1.2.15)
|
||||
- , dovecot-common(<< 1:2.0)
|
||||
- , dovecot-imapd (>= 1:1.2.15)
|
||||
- , dovecot-pop3d (>= 1:1.2.15)
|
||||
+ , dovecot-core (>=1:2.1.7)
|
||||
, dovecot-imapd
|
||||
, dovecot-pop3d
|
||||
, dovecot-mysql
|
||||
@@ -102,7 +102,7 @@
|
||||
+ , dovecot-imapd (>=1:2.1.7)
|
||||
+ , dovecot-pop3d (>=1:2.1.7)
|
||||
, vlogger
|
||||
, mailutils | mailx
|
||||
, zip
|
||||
@@ -99,7 +98,7 @@
|
||||
Architecture: all
|
||||
Pre-depends: debconf (>= 0.5.00) | debconf-2.0, acl
|
||||
Depends: debianutils (>= 1.13.1)
|
||||
|
@ -27,12 +32,17 @@
|
|||
, libapache2-mod-php5
|
||||
, php5-mysql
|
||||
, phpmyadmin
|
||||
@@ -127,7 +127,7 @@
|
||||
@@ -123,10 +122,9 @@
|
||||
, gettext (>= 0.10.40-5)
|
||||
, adduser
|
||||
, mysql-client
|
||||
, sudo
|
||||
- , dovecot-common (>= 1:2.1.7)
|
||||
+ , dovecot-core (>= 1:2.1.7)
|
||||
, dovecot-imapd
|
||||
, dovecot-pop3d
|
||||
, dovecot-mysql
|
||||
- , dovecot-common (>=1:1.2.15)
|
||||
- , dovecot-common(<< 1:2.0)
|
||||
- , dovecot-imapd (>= 1:1.2.15)
|
||||
- , dovecot-pop3d (>= 1:1.2.15)
|
||||
+ , dovecot-core (>=1:2.1.7)
|
||||
+ , dovecot-imapd (>=1:2.1.7)
|
||||
+ , dovecot-pop3d (>=1:2.1.7)
|
||||
, vlogger
|
||||
, mailutils | mailx
|
||||
, incron
|
||||
|
|
Loading…
Reference in New Issue