[Pkg-owncloud-commits] [owncloud-client] 109/211: Merge pull request #2319 from owncloud/sqlite_capi

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 52a5729298363c00f7da05a88ac4723e0c93d8e9
Merge: 4525161 b984958
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Fri Oct 17 12:11:27 2014 +0200

    Merge pull request #2319 from owncloud/sqlite_capi
    
    Introduce a common sqlite layer across csync and mirall.
    
    This avoids conflicts that both each load different and/or updated sqlite versions.

 CMakeLists.txt                          |      6 +
 admin/osx/macdeployqt.py                |      1 -
 cmake/modules/DefineCompilerFlags.cmake |      3 +-
 cmake/modules/FindSQLite3.cmake         |     14 +-
 cmake/modules/NSIS.template.in          |      9 -
 csync/src/CMakeLists.txt                |     11 +-
 csync/tests/ownCloud/ownCloud/Test.pm   |     62 +-
 csync/tests/ownCloud/t6.pl              |     51 +-
 doc/building.rst                        |      5 +-
 shell_integration/nautilus/syncstate.py |     16 +-
 src/3rdparty/sqlite3/sqlite3.c          | 148882 +++++++++++++++++++++++++++++
 src/3rdparty/sqlite3/sqlite3.h          |   7494 ++
 src/CMakeLists.txt                      |     11 +-
 src/main.cpp                            |      1 +
 src/mirall/folder.cpp                   |     94 +
 src/mirall/folder.h                     |     16 +-
 src/mirall/folderman.cpp                |     21 +-
 src/mirall/folderwatcher.cpp            |      2 +-
 src/mirall/ownsql.cpp                   |    259 +
 src/mirall/ownsql.h                     |     81 +
 src/mirall/socketapi.cpp                |    345 +-
 src/mirall/socketapi.h                  |     21 +-
 src/mirall/syncengine.cpp               |     20 +-
 src/mirall/syncengine.h                 |      7 +
 src/mirall/syncfileitem.h               |      7 +
 src/mirall/syncjournaldb.cpp            |    417 +-
 src/mirall/syncjournaldb.h              |     33 +-
 src/mirall/utility.cpp                  |     12 +
 src/mirall/utility.h                    |      4 +
 test/CMakeLists.txt                     |      2 +
 test/testownsql.h                       |    155 +
 31 files changed, 157571 insertions(+), 491 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git