kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

adding a choice between MySQL & MariaDB for MySQL service in the dependency. Fixes #159

This commit is contained in:
Benjamin Sonntag 2017-08-12 17:26:12 +02:00
parent aaa5a68388
commit 4bc4626d14
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/control vendored
View File

@ -37,7 +37,6 @@ Depends: debianutils (>= 1.13.1)
, gettext (>= 0.10.40-5) , gettext (>= 0.10.40-5)
, sudo , sudo
, adduser , adduser
, mysql-client
, dnsutils , dnsutils
, dovecot-common (>=1:1.2.15) , dovecot-common (>=1:1.2.15)
, dovecot-common(<< 1:2.0) , dovecot-common(<< 1:2.0)
@ -49,12 +48,12 @@ Depends: debianutils (>= 1.13.1)
, incron , incron
, cron , cron
, opendkim , opendkim
, mysql-client(>= 5.0) , mysql-client(>= 5.0) | mariadb-client
, php5-curl , php5-curl
, quota , quota
, pwgen , pwgen
, ${misc:Depends} , ${misc:Depends}
Recommends: mysql-server(>= 5.0) Recommends: mysql-server(>= 5.0) | mariadb-server
, ntp , ntp
, unzip , unzip
, bzip2 , bzip2
@ -123,7 +122,6 @@ Depends: debianutils (>= 1.13.1)
, lockfile-progs (>= 0.1.9) , lockfile-progs (>= 0.1.9)
, gettext (>= 0.10.40-5) , gettext (>= 0.10.40-5)
, adduser , adduser
, mysql-client
, sudo , sudo
, dovecot-common (>=1:1.2.15) , dovecot-common (>=1:1.2.15)
, dovecot-common(<< 1:2.0) , dovecot-common(<< 1:2.0)
@ -134,7 +132,7 @@ Depends: debianutils (>= 1.13.1)
, incron , incron
, cron , cron
, opendkim , opendkim
, mysql-client(>= 5.0) , mysql-client(>= 5.0) | mariadb-client
, php5-curl , php5-curl
, ${misc:Depends} , ${misc:Depends}
Recommends: Recommends:
@ -332,7 +330,7 @@ Package: alternc-ssl
Priority: optional Priority: optional
Section: admin Section: admin
Architecture: all 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) Conflicts: alternc (<< 3.0)
Description: HTTPS module for AlternC Description: HTTPS module for AlternC
AlternC is a mutualized hosting software manager for Linux. AlternC is a mutualized hosting software manager for Linux.

42
jessie/control.diff
View File

@ -1,5 +1,5 @@
--- control.wheezy 2015-12-22 12:11:43.355751408 +0100 --- debian/control 2017-08-12 17:23:26.603473696 +0200
+++ control 2015-12-22 12:12:45.489205807 +0100 +++ /tmp/control.jessie 2017-08-12 17:24:48.811868407 +0200
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
, bash (>= 4) , bash (>= 4)
, acl , acl
@ -9,16 +9,21 @@
, libapache2-mod-php5 , libapache2-mod-php5
, php5-mysql , php5-mysql
, phpmyadmin , phpmyadmin
@@ -39,7 +39,7 @@ @@ -38,10 +38,9 @@
, sudo
, adduser , adduser
, mysql-client
, dnsutils , 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-core (>=1:2.1.7)
, dovecot-imapd + , dovecot-imapd (>=1:2.1.7)
, dovecot-pop3d + , dovecot-pop3d (>=1:2.1.7)
, dovecot-mysql , vlogger
@@ -102,7 +102,7 @@ , mailutils | mailx
, zip
@@ -99,7 +98,7 @@
Architecture: all Architecture: all
Pre-depends: debconf (>= 0.5.00) | debconf-2.0, acl Pre-depends: debconf (>= 0.5.00) | debconf-2.0, acl
Depends: debianutils (>= 1.13.1) Depends: debianutils (>= 1.13.1)
@ -27,12 +32,17 @@
, libapache2-mod-php5 , libapache2-mod-php5
, php5-mysql , php5-mysql
, phpmyadmin , phpmyadmin
@@ -127,7 +127,7 @@ @@ -123,10 +122,9 @@
, gettext (>= 0.10.40-5)
, adduser , adduser
, mysql-client
, sudo , sudo
- , dovecot-common (>= 1:2.1.7) - , dovecot-common (>=1:1.2.15)
+ , dovecot-core (>= 1:2.1.7) - , dovecot-common(<< 1:2.0)
, dovecot-imapd - , dovecot-imapd (>= 1:1.2.15)
, dovecot-pop3d - , dovecot-pop3d (>= 1:1.2.15)
, dovecot-mysql + , dovecot-core (>=1:2.1.7)
+ , dovecot-imapd (>=1:2.1.7)
+ , dovecot-pop3d (>=1:2.1.7)
, vlogger
, mailutils | mailx
, incron