[SCM] Akonadi packaging branch, experimental, updated. debian/1.3.1-2-16-gbcb64b7

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit bdfc441597bf6418bc0dfe6ea9d51ecbea5b844d
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Aug 13 14:50:42 2010 +0300

    Make akonadi QSQLite driver work when it was compiled against SQLite 3.7.0 or later.
    
    Patch 02_sanitize_sqlite_version_check.diff.
---
 debian/changelog                                   |    2 +
 .../patches/02_sanitize_sqlite_version_check.diff  |   21 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ec2ba8..ac2a442 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ akonadi (1.4.0-0r1) UNRELEASED; urgency=low
     or replace Conflicts with Breaks respectively,
   * Improve passing of MYSQLD_EXECUTABLE flag to cmake.
   * Drop 02_hardcode_debian_mysqld_path.diff, not needed any more.
+  * Add 02_sanitize_sqlite_version_check.diff patch to make akonadi QSQLite
+    driver work when it was compiled against SQLite 3.7.0 or later.
 
  -- Modestas Vainius <modax at debian.org>  Fri, 13 Aug 2010 02:45:37 +0300
 
diff --git a/debian/patches/02_sanitize_sqlite_version_check.diff b/debian/patches/02_sanitize_sqlite_version_check.diff
new file mode 100644
index 0000000..bbebcb6
--- /dev/null
+++ b/debian/patches/02_sanitize_sqlite_version_check.diff
@@ -0,0 +1,21 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: sanitize SQLite library version check
+Forwarded: no
+Last-Update: 2010-08-13
+
+A weird SQLite library version check makes akonadi crash with SQLite 3.7.0 or
+later. This patch loosens it a bit. However, even such a variant of the check
+does not make much sense because it's basically set to successed or fail at
+compiled time. Hence if it is needed, it should be done at cmake/configure
+time.
+--- a/qsqlite/src/qsql_sqlite.cpp
++++ b/qsqlite/src/qsql_sqlite.cpp
+@@ -323,7 +323,7 @@ bool QSQLiteResult::prepare(const QStrin
+ 
+     setSelect(false);
+ 
+-    Q_ASSERT(SQLITE_VERSION_NUMBER == 3006023);
++    Q_ASSERT(SQLITE_VERSION_NUMBER >= 3006023);
+ #if (SQLITE_VERSION_NUMBER >= 3003011)
+ //    int res = sqlite3_prepare16_v2(d->access, query.constData(), (query.size() + 1) * sizeof(QChar),
+ //                                   &d->stmt, 0);
diff --git a/debian/patches/series b/debian/patches/series
index b2501b6..6f8728a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_x11_not_required.diff
+02_sanitize_sqlite_version_check.diff

-- 
Akonadi packaging