SF.net SVN: postfixadmin:[1801] trunk

[<chr...@us...>]

Revision: 1801
          http://sourceforge.net/p/postfixadmin/code/1801
Author:   christian_boltz
Date:     2015-09-26 13:11:20 +0000 (Sat, 26 Sep 2015)
Log Message:
-----------
refresh debian/patches/db_credentials

Also update the changelog once more - let's hope this is really the
beta3 release now ;-)

Modified Paths:
--------------
    trunk/CHANGELOG.TXT
    trunk/debian/changelog
    trunk/debian/patches/db_credentials

Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT	2015-09-26 11:02:41 UTC (rev 1800)
+++ trunk/CHANGELOG.TXT	2015-09-26 13:11:20 UTC (rev 1801)
@@ -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:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2015-09-26 11:02:41 UTC (rev 1800)
+++ trunk/debian/changelog	2015-09-26 13:11:20 UTC (rev 1801)
@@ -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 <da...@pa...>  Sat, 26 Sep 2015 12:36:00 +0100
+ -- David Goodwin <da...@pa...>  Sat, 26 Sep 2015 15:05:00 +0100
 
 postfixadmin (2.92-1) unstable; urgency=low
 

Modified: trunk/debian/patches/db_credentials
===================================================================
--- trunk/debian/patches/db_credentials	2015-09-26 11:02:41 UTC (rev 1800)
+++ trunk/debian/patches/db_credentials	2015-09-26 13:11:20 UTC (rev 1801)
@@ -5,9 +5,9 @@
 
 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 @@
  /*****************************************************************
   *  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
   * 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 @@
  
  // 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';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.