From: Vincent Bernat <bernat@debian.org>
Date: Fri, 11 Mar 2011 08:08:32 +0000 (+0100)
Subject: Imported Debian patch 0.5.1+dfsg-7
X-Git-Url: https://git.donarmstrong.com/?p=roundcube.git;a=commitdiff_plain;h=6dc2542287385920eb1cd666328aba4502206001

Imported Debian patch 0.5.1+dfsg-7
---

diff --git a/debian/changelog b/debian/changelog
index 38d56ed..04aa125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.5.1+dfsg-7) unstable; urgency=low
+
+  * Make dbconfig-common use sqlite by default to ensure that the package
+    can be configured non-interactively in most cases. Closes: #617754.
+
+ -- Vincent Bernat <bernat@debian.org>  Fri, 11 Mar 2011 09:08:32 +0100
+
 roundcube (0.5.1+dfsg-6) unstable; urgency=low
 
   * Handle incorrect upgrade from 0.3.1-6 when "changed" column already
diff --git a/debian/roundcube-core.config b/debian/roundcube-core.config
index 4914ae7..72347da 100644
--- a/debian/roundcube-core.config
+++ b/debian/roundcube-core.config
@@ -41,7 +41,7 @@ db_input medium roundcube/language || true
 db_go || true
 
 if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
-        dbc_dbtypes="mysql, pgsql, sqlite"
+        dbc_dbtypes="sqlite, mysql, pgsql"
         dbc_authmethod_user="password"
         . /usr/share/dbconfig-common/dpkg/config 
         dbc_go roundcube $@