[Pkg-owncloud-commits] [owncloud-client] 01/02: New upstream version 2.4.0~rc2+dfsg

[Sandro Knauß]

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

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

commit bd3a17f359a345f8cf806e0085dec34efb166f63
Merge: 177246b 61939d6
Author: Sandro Knauß <hefee at debian.org>
Date:   Sat Dec 16 10:57:57 2017 +0100

    New upstream version 2.4.0~rc2+dfsg

 .tag                                  |  2 +-
 ChangeLog                             |  7 +++--
 Jenkinsfile                           |  4 +--
 VERSION.cmake                         |  2 +-
 mirall.desktop.in                     | 33 ++++++++++++++++++++++
 src/CMakeLists.txt                    | 25 ++++++++---------
 src/common/ownsql.cpp                 |  1 +
 src/common/syncjournaldb.cpp          |  2 +-
 src/csync/csync.cpp                   |  7 +++--
 src/csync/csync_reconcile.cpp         | 47 +++++++++++++++++++++++--------
 src/csync/csync_rename.cpp            | 20 +++++++++++--
 src/csync/csync_rename.h              | 15 ++++++++--
 src/gui/activitywidget.cpp            |  3 +-
 src/gui/notificationwidget.cpp        |  4 +--
 src/gui/ocsjob.cpp                    |  1 +
 src/gui/ocsjob.h                      |  2 ++
 src/gui/servernotificationhandler.cpp | 14 ++++++++-
 src/libsync/discoveryphase.cpp        |  2 +-
 test/testsyncjournaldb.cpp            |  7 +++--
 test/testsyncmove.cpp                 | 27 +++++++++++++-----
 translations/client_ca.ts             | 30 ++++++++++++--------
 translations/client_cs.ts             | 30 ++++++++++++--------
 translations/client_de.ts             | 30 ++++++++++++--------
 translations/client_el.ts             | 30 ++++++++++++--------
 translations/client_en.ts             | 30 ++++++++++++--------
 translations/client_es.ts             | 30 ++++++++++++--------
 translations/client_es_AR.ts          | 30 ++++++++++++--------
 translations/client_et.ts             | 30 ++++++++++++--------
 translations/client_eu.ts             | 30 ++++++++++++--------
 translations/client_fa.ts             | 30 ++++++++++++--------
 translations/client_fi.ts             | 30 ++++++++++++--------
 translations/client_fr.ts             | 30 ++++++++++++--------
 translations/client_gl.ts             | 30 ++++++++++++--------
 translations/client_hu.ts             | 30 ++++++++++++--------
 translations/client_it.ts             | 30 ++++++++++++--------
 translations/client_ja.ts             | 44 +++++++++++++++++------------
 translations/client_nb_NO.ts          | 38 +++++++++++++++----------
 translations/client_nl.ts             | 30 ++++++++++++--------
 translations/client_pl.ts             | 53 +++++++++++++++++++++--------------
 translations/client_pt.ts             | 30 ++++++++++++--------
 translations/client_pt_BR.ts          | 30 ++++++++++++--------
 translations/client_ru.ts             | 30 ++++++++++++--------
 translations/client_sk.ts             | 30 ++++++++++++--------
 translations/client_sl.ts             | 30 ++++++++++++--------
 translations/client_sr.ts             | 30 ++++++++++++--------
 translations/client_sv.ts             | 30 ++++++++++++--------
 translations/client_th.ts             | 30 ++++++++++++--------
 translations/client_tr.ts             | 30 ++++++++++++--------
 translations/client_uk.ts             | 30 ++++++++++++--------
 translations/client_zh_CN.ts          | 30 ++++++++++++--------
 translations/client_zh_TW.ts          | 30 ++++++++++++--------
 51 files changed, 783 insertions(+), 417 deletions(-)

diff --cc .tag
index 128a45a,6828f88..7a04858
--- a/.tag
+++ b/.tag
@@@ -1,1 -1,1 +1,1 @@@
- 1a5a87c8fe469aa354d16fc379a67c65b058d541
 -$Format:%H$
++61939d67e6c3f2487f83cee9ac9d53454d136359
diff --cc VERSION.cmake
index 66eaf35,abc8682..39e89fa
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@@ -5,7 -5,7 +5,7 @@@ set( MIRALL_VERSION_YEAR  2017 
  set( MIRALL_SOVERSION 0 )
  
  if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-     set( MIRALL_VERSION_SUFFIX "rc1" )
 -    set( MIRALL_VERSION_SUFFIX "rc2") #e.g. beta1, beta2, rc1
++    set( MIRALL_VERSION_SUFFIX "rc2" )
  endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
  
  if( NOT DEFINED MIRALL_VERSION_BUILD )

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