[Pkg-owncloud-commits] [owncloud-client] 329/333: Merge tag 'upstream/1.6.0_beta1+dfsg'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:17:11 UTC 2014
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 f3e59b1154809082676b3928febe94808bc70076
Merge: a1caedf 1229b25
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Thu Apr 17 23:49:52 2014 +0200
Merge tag 'upstream/1.6.0_beta1+dfsg'
Upstream version 1.6.0~beta1+dfsg
# gpg: Unterschrift vom Do 17 Apr 2014 23:49:46 CEST mittels RSA-Schlüssel ID 50605636
# gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"
.gitmodules | 3 +
.tag | 2 +-
CMakeLists.txt | 31 +-
ChangeLog | 18 +
README.md | 3 +-
VERSION.cmake | 6 +-
cmake/modules/AddAppIconMacro.cmake | 2 +-
cmake/modules/Copyright.txt | 13 +
cmake/modules/DefineInstallationPaths.cmake | 22 +-
cmake/modules/DeployQt5.cmake | 381 ++++
cmake/modules/FindQt5Keychain.cmake | 29 +
cmake/modules/FindQtKeychain.cmake | 25 +-
cmake/modules/NSIS.template.in | 70 +-
cmake/modules/QtVersionAbstraction.cmake | 135 +-
csync/src/CMakeLists.txt | 7 +-
csync/src/csync.c | 190 +-
csync/src/csync.h | 59 +-
csync/src/csync_dbtree.c | 235 ---
csync/src/csync_dbtree.h | 60 -
csync/src/csync_exclude.c | 20 +-
csync/src/csync_misc.c | 42 -
csync/src/csync_misc.h | 15 -
csync/src/csync_owncloud.c | 201 +-
csync/src/csync_owncloud.h | 20 +-
csync/src/csync_owncloud_recursive_propfind.c | 1 -
csync/src/csync_owncloud_util.c | 25 -
csync/src/csync_private.h | 25 +-
csync/src/csync_reconcile.c | 52 +-
csync/src/csync_rename.cc | 13 -
csync/src/csync_statedb.c | 497 +++--
csync/src/csync_statedb.h | 21 +-
csync/src/csync_time.c | 111 --
csync/src/csync_time.h | 1 -
csync/src/csync_update.c | 107 +-
csync/src/csync_util.c | 34 -
csync/src/csync_util.h | 2 -
csync/src/vio/csync_vio.c | 582 +-----
csync/src/vio/csync_vio.h | 27 -
csync/src/vio/csync_vio_file_stat.h | 2 +-
csync/src/vio/csync_vio_handle.c | 50 -
csync/src/vio/csync_vio_handle.h | 3 +-
csync/src/vio/csync_vio_handle_private.h | 9 -
csync/src/vio/csync_vio_local.c | 327 +--
csync/src/vio/csync_vio_local.h | 26 +-
csync/src/vio/csync_vio_method.h | 123 --
csync/src/vio/csync_vio_module.h | 33 -
csync/tests/CMakeLists.txt | 5 -
csync/tests/csync_tests/check_csync_create.c | 3 -
csync/tests/csync_tests/check_csync_statedb_load.c | 14 +-
.../tests/csync_tests/check_csync_statedb_query.c | 6 +-
csync/tests/csync_tests/check_csync_time.c | 69 -
csync/tests/csync_tests/check_csync_treewalk.c | 202 --
csync/tests/ownCloud/HTTP/DAV.pm | 2075 --------------------
csync/tests/ownCloud/README | 4 +
csync/tests/ownCloud/ownCloud/Test.pm | 316 ++-
csync/tests/ownCloud/t1.cfg.in | 7 +-
csync/tests/ownCloud/t1.pl | 2 -
csync/tests/ownCloud/t4.pl | 24 +
csync/tests/ownCloud/t5.pl | 69 +
csync/tests/ownCloud/t6.pl | 94 +
csync/tests/vio_tests/check_vio.c | 359 +---
csync/tests/vio_tests/check_vio_handle.c | 74 -
doc/advancedusage.rst | 5 +
doc/building.rst | 67 +-
doc/faq.rst | 16 +
doc/index.rst | 1 +
doc/owncloudcmd.1.rst | 32 +
doc/owncloudcmd.rst | 64 +
src/CMakeLists.txt | 185 +-
src/creds/credentialsfactory.cpp | 9 +
src/creds/dummycredentials.cpp | 2 +-
src/creds/dummycredentials.h | 3 +
src/creds/httpcredentials.cpp | 13 +-
src/creds/shibboleth/shibbolethuserjob.cpp | 56 +
src/creds/shibboleth/shibbolethuserjob.h | 44 +
src/creds/shibbolethcredentials.cpp | 67 +-
src/creds/shibbolethcredentials.h | 3 +
src/creds/tokencredentials.cpp | 227 +++
src/creds/tokencredentials.h | 70 +
src/mirall/account.cpp | 5 +-
src/mirall/account.h | 17 +-
src/mirall/accountsettings.cpp | 237 ++-
src/mirall/accountsettings.h | 9 +-
src/mirall/application.cpp | 6 +-
src/mirall/connectionvalidator.cpp | 1 -
src/mirall/filesystem.cpp | 121 ++
src/mirall/filesystem.h | 42 +
src/mirall/folder.cpp | 265 ++-
src/mirall/folder.h | 23 +-
src/mirall/folderman.cpp | 11 +-
src/mirall/folderman.h | 2 +
src/mirall/folderwatcher.cpp | 43 +-
src/mirall/folderwatcher.h | 4 +-
src/mirall/folderwatcher_linux.cpp | 18 +-
src/mirall/folderwatcher_mac.cpp | 39 +-
src/mirall/folderwatcher_mac.h | 4 +-
src/mirall/logger.cpp | 17 +-
src/mirall/mirallconfigfile.cpp | 3 -
src/mirall/networkjobs.cpp | 50 +-
src/mirall/networkjobs.h | 12 +-
src/mirall/owncloudgui.cpp | 122 +-
src/mirall/owncloudgui.h | 8 +-
src/mirall/owncloudpropagator.cpp | 1030 +---------
src/mirall/owncloudpropagator.h | 145 +-
src/mirall/owncloudpropagator_p.h | 120 +-
src/mirall/owncloudsetupwizard.cpp | 6 +-
src/mirall/owncloudtheme.cpp | 3 +-
src/mirall/progressdispatcher.cpp | 210 +-
src/mirall/progressdispatcher.h | 113 +-
src/mirall/propagator_legacy.cpp | 605 ++++++
src/mirall/propagator_legacy.h | 82 +
src/mirall/propagator_qnam.cpp | 574 ++++++
src/mirall/propagator_qnam.h | 152 ++
src/mirall/propagatorjobs.cpp | 327 +++
src/mirall/propagatorjobs.h | 111 ++
src/mirall/protocolwidget.cpp | 168 +-
src/mirall/protocolwidget.h | 11 +-
src/mirall/quotainfo.cpp | 5 +-
src/mirall/settingsdialog.cpp | 8 -
src/mirall/settingsdialog.h | 1 -
src/mirall/settingsdialogmac.cpp | 98 +
src/mirall/settingsdialogmac.h | 44 +
src/mirall/socketapi.cpp | 7 +-
src/mirall/{csyncthread.cpp => syncengine.cpp} | 258 ++-
src/mirall/{csyncthread.h => syncengine.h} | 73 +-
src/mirall/syncfileitem.h | 31 +-
src/mirall/syncjournaldb.cpp | 8 +
src/mirall/syncjournaldb.h | 14 +-
src/mirall/syncrunfilelog.cpp | 174 ++
src/mirall/syncrunfilelog.h | 48 +
src/mirall/utility.cpp | 58 +-
src/mirall/utility.h | 18 +
src/mirall/utility_unix.cpp | 2 +-
src/owncloudcmd/owncloudcmd.cpp | 92 +-
src/owncloudcmd/simplesslerrorhandler.cpp | 31 +
src/owncloudcmd/simplesslerrorhandler.h | 26 +
src/updater/ocupdater.cpp | 2 +-
src/wizard/owncloudsetupnocredspage.ui | 3 -
sync-exclude.lst | 2 +
test/CMakeLists.txt | 3 +
test/test_journal.db | Bin 0 -> 57344 bytes
test/testcsyncsqlite.h | 121 ++
translations/.tx/config | 6 +-
translations/mirall_ca.ts | 1046 +++++-----
translations/mirall_cs.ts | 1108 ++++++-----
translations/mirall_de.ts | 1036 +++++-----
translations/mirall_el.ts | 1118 ++++++-----
translations/mirall_en.ts | 955 ++++-----
translations/mirall_es.ts | 1034 +++++-----
translations/mirall_es_AR.ts | 1026 +++++-----
translations/mirall_et.ts | 1040 +++++-----
translations/mirall_eu.ts | 1114 ++++++-----
translations/mirall_fa.ts | 973 ++++-----
translations/mirall_fi.ts | 1048 +++++-----
translations/mirall_fr.ts | 1040 +++++-----
translations/mirall_gl.ts | 1034 +++++-----
translations/mirall_hu.ts | 1079 +++++-----
translations/mirall_it.ts | 1040 +++++-----
translations/mirall_ja.ts | 1086 +++++-----
translations/mirall_nl.ts | 1032 +++++-----
translations/mirall_pl.ts | 1139 ++++++-----
translations/mirall_pt.ts | 1401 ++++++-------
translations/mirall_pt_BR.ts | 1032 +++++-----
translations/mirall_ru.ts | 1031 +++++-----
translations/mirall_sk.ts | 1051 +++++-----
translations/mirall_sl.ts | 1042 +++++-----
translations/mirall_sv.ts | 1200 +++++------
translations/mirall_th.ts | 977 ++++-----
translations/{pofiles/tr.po => mirall_tr.ts} | 1038 +++++-----
translations/mirall_uk.ts | 975 ++++-----
translations/mirall_zh_CN.ts | 1027 +++++-----
translations/mirall_zh_TW.ts | 979 ++++-----
172 files changed, 22309 insertions(+), 22088 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list