From kde-commits  Fri Feb 28 21:38:35 2014
From: =?utf-8?q?Dan_Vr=C3=A1til?= <dvratil () redhat ! com>
Date: Fri, 28 Feb 2014 21:38:35 +0000
To: kde-commits
Subject: [akonadi/1.12] /: Akonadi 1.11.80
Message-Id: <E1WJV8d-000292-3C () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=139362352406787

Git commit 3c1192b3a1078842ab0e62498065940e7700777c by Dan Vr=C3=A1til.
Committed on 28/02/2014 at 21:18.
Pushed by dvratil into branch '1.12'.

Akonadi 1.11.80

M  +1    -1    CMakeLists.txt
M  +4    -3    INSTALL
M  +17   -0    NEWS

http://commits.kde.org/akonadi/3c1192b3a1078842ab0e62498065940e7700777c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b55dca1..dd701fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cm=
ake ${CMAKE_CURRENT_BIN
 =

 set(AKONADI_VERSION_MAJOR "1")
 set(AKONADI_VERSION_MINOR "11")
-set(AKONADI_VERSION_PATCH "43")
+set(AKONADI_VERSION_PATCH "80")
 =

 set(AKONADI_VERSION "${AKONADI_VERSION_MAJOR}.${AKONADI_VERSION_MINOR}.${A=
KONADI_VERSION_PATCH}")
 set(AKONADI_VERSION_STRING "${AKONADI_VERSION}")
diff --git a/INSTALL b/INSTALL
index 86846f3..0d455b4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -36,6 +36,8 @@ The following options are available when running CMake:
 * STATIC_LIBRARY (Default: FALSE): Build the Akonadi server libraries stat=
ically. Only useful for certain cases (eg: WINCE builds).
 * DATABASE_BACKEND (Default: MYSQL, available: MYSQL, POSTGRES, SQLITE): D=
efine which database driver to use by default.
   MYSQL is preferred, SQLITE should be avoided.
+* QT5_BUILD (Default: FALSE): Build against Qt5 instead of Qt4.
+* WITH_SOPRANO (Default: TRUE): Don't build with Soprano/Nepomuk support
 =

 =3D=3D=3D Build Requirements =3D=3D=3D
 =

@@ -45,15 +47,14 @@ Required:
 * CMake (http://www.cmake.org) >=3D 2.8.8
 * Qt4 >=3D 4.6.0 (http://qt.nokia.com/downloads)
 * Shared-mime-info >=3D 0.20 (http://freedesktop.org/wiki/Software/shared-=
mime-info)
-* Soprano (http://soprano.sourceforge.net)
 * Xsltproc (http://xmlsoft.org/XSLT/downloads.html)
 =

 Optional:
 =

 * Mysqld (http://www.mysql.com) - Optional at build time. You can pass -DM=
YSQLD_EXECUTABLE=3D/path/to/mysqld when running CMake instead
 * SQlite >=3D 3.6.23 (http://www.sqlite.org) - Needed if you want to build=
 the Sqlite backend
-- Postgresql (http://www.postgres.org) - Optional at build time. You can p=
ass -DPOSTGRES_PATH=3D/path/to/pg_ctl when running CMake instead
-
+* Postgresql (http://www.postgres.org) - Optional at build time. You can p=
ass -DPOSTGRES_PATH=3D/path/to/pg_ctl when running CMake instead
+* Soprano (http://soprano.sourceforge.net)
 =

 =3D=3D=3D Runtime Requirements =3D=3D=3D
 =

diff --git a/NEWS b/NEWS
index 7a4a408..4a50bc5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+1.11.80                       28-February-2014
+----------------------------------------------
+- Server-search support
+- Search plugins support
+- Tags support
+- Fixes and improvements in search
+- Fixes in protocol parser
+- Fixed inter-resource moves
+- Fixed .desktop files parsing
+- Optimized collections tasks scheduling
+- Optimized flags handling
+- Optimized appending new items via AK-APPEND
+- Handle database transactions deadlocks and timeouts
+- Improved PostgreSQL support
+- Soprano is now an optional dependency
+- Removed MySQL Embedded support
+
 1.11.0			      28-November-2013
 ----------------------------------------------
 - fix joined UPDATE queries failing with SQLite