diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index a3b06ea8..c38acd43 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -9,7 +9,7 @@ # Last update: # $Id$ -Version 3.0 beta3 (2.93) - 2015/09/26 - SVN r1799 +Version 3.0 beta3 (2.93) - 2015/09/26 - SVN r1802 ------------------------------------------------- Summary of major changes: diff --git a/debian/changelog b/debian/changelog index 4bc3f534..91a0b9c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ postfixadmin (2.93-1) unstable; urgency=low * New upstream release (effectively beta3 for v3.0) + * update dependencies to allow mariadb as database - -- David Goodwin Sat, 26 Sep 2015 12:36:00 +0100 + -- David Goodwin Sat, 26 Sep 2015 15:05:00 +0100 postfixadmin (2.92-1) unstable; urgency=low diff --git a/debian/patches/db_credentials b/debian/patches/db_credentials index ffb7c745..831f3345 100644 --- a/debian/patches/db_credentials +++ b/debian/patches/db_credentials @@ -5,9 +5,9 @@ Last-Update: 2012-05-28 Index: postfixadmin/config.inc.php =================================================================== ---- postfixadmin.orig/config.inc.php 2011-12-18 05:22:05.000000000 +0100 -+++ postfixadmin/config.inc.php 2011-12-18 05:31:16.000000000 +0100 -@@ -16,6 +16,11 @@ +--- postfixadmin.orig/config.inc.php 2015-09-26 15:03:05.000000000 +0100 ++++ postfixadmin/config.inc.php 2015-09-26 15:03:16.000000000 +0100 +@@ -15,6 +15,11 @@ * Contains configuration options. */ @@ -19,7 +19,7 @@ Index: postfixadmin/config.inc.php /***************************************************************** * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * You have to set $CONF['configured'] = true; before the -@@ -23,7 +28,7 @@ +@@ -22,7 +27,7 @@ * Doing this implies you have changed this file as required. * i.e. configuring database etc; specifying setup.php password etc. */ @@ -28,9 +28,9 @@ Index: postfixadmin/config.inc.php // In order to setup Postfixadmin, you MUST specify a hashed password here. // To create the hash, visit setup.php in a browser and type a password into the field, -@@ -85,11 +90,11 @@ +@@ -80,11 +85,11 @@ // mysql = MySQL 3.23 and 4.0, 4.1 or 5 - // mysqli = MySQL 4.1+ + // mysqli = MySQL 4.1+ or MariaDB // pgsql = PostgreSQL -$CONF['database_type'] = 'mysqli'; -$CONF['database_host'] = 'localhost';