[Pkg-owncloud-commits] [owncloud-client] 210/211: Imported Upstream version 1.7.0~rc1+dfsg

[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 5173a4b2f6e5af656ef1285db1aea4fe10e04065
Merge: dd13ce3 d0b40ba
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Oct 25 11:05:23 2014 +0200

    Imported Upstream version 1.7.0~rc1+dfsg

 .gitmodules                                        |   2 +-
 .tag                                               |   2 +-
 ChangeLog                                          |  46 ++++++
 VERSION.cmake                                      |   2 +-
 csync/src/csync.c                                  |  37 +++--
 csync/src/csync_exclude.c                          |  41 ++++++
 csync/src/csync_exclude.h                          |   8 ++
 csync/src/csync_reconcile.c                        |   1 -
 csync/src/csync_statedb.c                          | 158 +++++---------------
 csync/src/csync_statedb.h                          |   6 -
 csync/src/csync_update.c                           |  13 +-
 csync/src/std/c_string.c                           |   8 ++
 csync/src/std/c_string.h                           |  11 ++
 csync/tests/csync_tests/check_csync_exclude.c      |  20 +++
 csync/tests/csync_tests/check_csync_statedb_load.c |  39 +----
 .../tests/csync_tests/check_csync_statedb_query.c  |   6 +
 csync/tests/csync_tests/check_csync_update.c       |   9 ++
 csync/tests/ownCloud/ownCloud/Test.pm              |   2 +-
 csync/tests/ownCloud/t1.pl                         |  20 ++-
 csync/tests/ownCloud/t3.pl                         |   5 +-
 csync/tests/ownCloud/t6.pl                         |   2 +-
 src/CMakeLists.txt                                 |   3 +-
 src/mirall/discoveryphase.cpp                      |   2 +-
 src/mirall/folder.cpp                              |  90 ++++++++----
 src/mirall/folder.h                                |  11 +-
 src/mirall/folderman.cpp                           |  11 ++
 src/mirall/openfilemanager.cpp                     |  26 ++--
 src/mirall/owncloudgui.cpp                         |   8 +-
 src/mirall/owncloudsetupwizard.cpp                 |   8 +-
 src/mirall/ownsql.cpp                              |   9 +-
 src/mirall/ownsql.h                                |   5 +-
 src/mirall/protocolwidget.cpp                      |   2 +-
 src/mirall/selectivesyncdialog.cpp                 |  13 +-
 src/mirall/selectivesyncdialog.h                   |   6 +
 src/mirall/socketapi.cpp                           | 160 ++++++++++++++-------
 src/mirall/socketapi.h                             |   1 -
 src/mirall/syncengine.cpp                          |   9 +-
 src/mirall/syncjournaldb.cpp                       | 117 +++++++++++++--
 src/mirall/syncjournaldb.h                         |   6 +
 src/mirall/syncjournalfilerecord.cpp               |  14 ++
 src/mirall/syncjournalfilerecord.h                 |   3 +
 src/mirall/utility.cpp                             |  13 +-
 src/mirall/utility.h                               |   4 +-
 src/wizard/owncloudadvancedsetuppage.cpp           |   3 +-
 test/CMakeLists.txt                                |   1 +
 test/testsyncjournaldb.h                           | 118 +++++++++++++++
 translations/mirall_ca.ts                          | 129 +++++++++--------
 translations/mirall_cs.ts                          | 133 +++++++++--------
 translations/mirall_de.ts                          | 131 +++++++++--------
 translations/mirall_el.ts                          | 151 ++++++++++---------
 translations/mirall_en.ts                          | 131 +++++++++--------
 translations/mirall_es.ts                          | 131 +++++++++--------
 translations/mirall_es_AR.ts                       | 129 +++++++++--------
 translations/mirall_et.ts                          | 129 +++++++++--------
 translations/mirall_eu.ts                          | 129 +++++++++--------
 translations/mirall_fa.ts                          | 128 +++++++++--------
 translations/mirall_fi.ts                          | 128 +++++++++--------
 translations/mirall_fr.ts                          | 129 +++++++++--------
 translations/mirall_gl.ts                          | 129 +++++++++--------
 translations/mirall_hu.ts                          | 128 +++++++++--------
 translations/mirall_it.ts                          | 129 +++++++++--------
 translations/mirall_ja.ts                          | 129 +++++++++--------
 translations/mirall_nl.ts                          | 131 +++++++++--------
 translations/mirall_pl.ts                          | 129 +++++++++--------
 translations/mirall_pt.ts                          | 131 +++++++++--------
 translations/mirall_pt_BR.ts                       | 129 +++++++++--------
 translations/mirall_ru.ts                          | 129 +++++++++--------
 translations/mirall_sk.ts                          | 128 +++++++++--------
 translations/mirall_sl.ts                          | 129 +++++++++--------
 translations/mirall_sv.ts                          | 129 +++++++++--------
 translations/mirall_th.ts                          | 128 +++++++++--------
 translations/mirall_tr.ts                          | 129 +++++++++--------
 translations/mirall_uk.ts                          | 129 +++++++++--------
 translations/mirall_zh_CN.ts                       | 128 +++++++++--------
 translations/mirall_zh_TW.ts                       | 128 +++++++++--------
 75 files changed, 2753 insertions(+), 2098 deletions(-)

diff --cc .tag
index 61df0b0,6828f88..59dac45
--- a/.tag
+++ b/.tag
@@@ -1,1 -1,1 +1,1 @@@
- 21c8e65d13492136035f29fe969ea7d9f916f16a
 -$Format:%H$
++d0b40bab4773d29e762be70e1ab2e0da6ee4e69a

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