← Back to branch summary

~ubuntu-branches/ubuntu/vivid/akonadi/vivid

~ubuntu-branches/ubuntu/vivid/akonadi/vivid

Viewing all changes in revision 98.

Committer: Package Import Robot
Author(s): Rohan Garg
Date: 2014-05-08 15:08:19 UTC
mfrom: (3.1.20 sid)
Revision ID: package-import@ubuntu.com-20140508150819-gi3umc2j63pjgh2e

Tags: 1.12.1-1ubuntu1

* Merge from Debian unstable.  Remaining changes:
  - Add a mysqld-akonadi wrapper script.
  - Add apparmor profile for mysqld-akonadi (usr.sbin.mysqld-akonadi).
  - Make akonadi-backend-mysql depend on mysql-server-core-5.5 and
    mysql-client-core-5.5 instead of mysql-server-core.
  - Force dependency on akonadi-backend-mysql for akonadi-server.
  - Keep debian/libakonadiprotocolinternals1.symbols from Ubuntu

files added:
.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server/src

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server/src/handler

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server/src/handler/fetchhelper.cpp

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server/src

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server/src/storage

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server/src/storage/dbupdater.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/CMakeLists.txt

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/dbusconnectionpool.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/dbusconnectionpool.h

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/handler

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/handler/fetchhelper.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk/dbusconnectionpool.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk/dbusconnectionpool.h

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk/queryserviceclient.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/agentsearchinstance.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/searchmanager.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/searchtaskmanager.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/searchtaskmanager.h

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/storage

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/storage/itemretrievalmanager.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/storagejanitor.cpp

debian/patches/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch

debian/patches/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch

debian/patches/upstream_1.12-Use-per-thread-QDBusConnections.patch

server/src/dbusconnectionpool.cpp

server/src/dbusconnectionpool.h

files removed:
debian/installgen

server/src/nepomuk/dbusconnectionpool.cpp

server/src/nepomuk/dbusconnectionpool.h

files modified:
.pc/applied-patches

debian/changelog

debian/control

debian/patches/series

server/CMakeLists.txt

server/src/handler/fetchhelper.cpp

server/src/nepomuk/queryserviceclient.cpp

server/src/search/agentsearchinstance.cpp

server/src/search/searchmanager.cpp

server/src/search/searchtaskmanager.cpp

server/src/search/searchtaskmanager.h

server/src/storage/dbupdater.cpp

server/src/storage/itemretrievalmanager.cpp

server/src/storagejanitor.cpp

Show diffs side-by-side

added added

removed removed

.pc/applied-patches

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server/

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server/src/

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server/src/handler/

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server/src/handler/fetchhelper.cpp

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server/

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server/src/

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server/src/storage/

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server/src/storage/dbupdater.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/CMakeLists.txt

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/dbusconnectionpool.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/dbusconnectionpool.h

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/handler/

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/handler/fetchhelper.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk/

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk/dbusconnectionpool.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk/dbusconnectionpool.h

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk/queryserviceclient.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/agentsearchinstance.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/searchmanager.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/searchtaskmanager.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/searchtaskmanager.h

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/storage/

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/storage/itemretrievalmanager.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/storagejanitor.cpp

debian/changelog

debian/installgen

debian/patches/series

debian/patches/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch

debian/patches/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch

debian/patches/upstream_1.12-Use-per-thread-QDBusConnections.patch

server/CMakeLists.txt

server/src/dbusconnectionpool.cpp

server/src/dbusconnectionpool.h

server/src/handler/fetchhelper.cpp

server/src/nepomuk/dbusconnectionpool.cpp

server/src/nepomuk/dbusconnectionpool.h

server/src/nepomuk/queryserviceclient.cpp

server/src/search/agentsearchinstance.cpp

server/src/search/searchmanager.cpp

server/src/search/searchtaskmanager.cpp

server/src/search/searchtaskmanager.h

server/src/storage/dbupdater.cpp

server/src/storage/itemretrievalmanager.cpp

server/src/storagejanitor.cpp

Older »