[SCM] Akonadi packaging branch, experimental, updated. debian/1.3.1-2-19-gc5165b5

[José Manuel Santamaría Lema]

The following commit has been merged in the experimental branch:
commit e0adfb309bc2193573130f465fe074bd81533056
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Dec 20 18:17:38 2010 +0100

    Remove 02_sanitize_sqlite_version_check.diff, no longer needed.
---
 debian/changelog                                   |    3 ++
 .../patches/02_sanitize_sqlite_version_check.diff  |   21 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 542ad80..fbca046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,9 @@ akonadi (1.4.90-0r2) UNRELEASED; urgency=low
   * 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.
 
+  [ José Manuel Santamaría Lema ]
+  * Remove 02_sanitize_sqlite_version_check.diff, no longer needed.
+
  -- Modestas Vainius <modax at debian.org>  Fri, 13 Aug 2010 14:50:52 +0300
 
 akonadi (1.3.1-3) unstable; urgency=low
diff --git a/debian/patches/02_sanitize_sqlite_version_check.diff b/debian/patches/02_sanitize_sqlite_version_check.diff
deleted file mode 100644
index bbebcb6..0000000
--- a/debian/patches/02_sanitize_sqlite_version_check.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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 6f8728a..b2501b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_x11_not_required.diff
-02_sanitize_sqlite_version_check.diff

-- 
Akonadi packaging