[Pkg-owncloud-commits] [owncloud-client] 04/05: Merge tag 'debian/2.2.4+dfsg-1' into jessie-backports
Gaudenz Steinlin
gaudenz at moszumanska.debian.org
Fri Nov 4 10:38:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
gaudenz pushed a commit to branch jessie-backports
in repository owncloud-client.
commit f4e0b61b82d7baf9e337c204d4cad431d4cacc0d
Merge: acda166 c0fc227
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date: Fri Nov 4 11:22:08 2016 +0100
Merge tag 'debian/2.2.4+dfsg-1' into jessie-backports
2.2.4+dfsg-1 unstable; urgency=medium
.tag | 2 +-
ChangeLog | 37 +-
Jenkinsfile | 58 +++
README.md | 2 +-
VERSION.cmake | 2 +-
cmake/modules/DefineCMakeDefaults.cmake | 2 +-
cmake/modules/DefineCompilerFlags.cmake | 2 +-
cmake/modules/DefineInstallationPaths.cmake | 2 +-
cmake/modules/DefinePlatformDefaults.cmake | 2 +-
cmake/modules/FindINotify.cmake | 2 +-
cmake/modules/FindPackageVersionCheck.cmake | 2 +-
cmake/modules/FindPdfLatex.cmake | 2 +-
cmake/modules/FindQt5Keychain.cmake | 2 +-
cmake/modules/FindQtKeychain.cmake | 2 +-
cmake/modules/FindSphinx.cmake | 2 +-
cmake/modules/MacroCopyFile.cmake | 2 +-
cmake/modules/NSIS.template.in | 3 +
cmake/modules/QtVersionAbstraction.cmake | 2 +-
cmake/modules/UseDoxygen.cmake | 2 +-
cmake/modules/Warnings.cmake | 2 +-
csync/src/csync_statedb.c | 4 +-
csync/src/csync_update.c | 18 +-
csync/src/vio/csync_vio_file_stat.c | 1 +
csync/src/vio/csync_vio_local_unix.c | 2 +-
csync/src/vio/csync_vio_local_win.c | 23 +-
csync/tests/ownCloud/t_recall.pl | 10 +
debian/changelog | 9 +
debian/control | 1 +
debian/copyright | 3 +-
debian/patches/0002-debian_version.patch | 2 +-
debian/patches/0003-skip_tests_freebsd.patch | 2 +-
debian/patches/0004-use_system_buildflags.patch | 2 +-
debian/patches/0005-remove_admin.patch | 2 +-
debian/patches/0006-move-configfile.patch | 2 +-
debian/patches/0007-move-translations.patch | 2 +-
debian/patches/0008-make-reproducable.patch | 2 +-
.../0009-fix-installpath-of-dolphin-plugin.patch | 2 +-
.../0010-fix-build-with-openssl1.1.0b.patch | 18 +
debian/patches/series | 1 +
doc/building.rst | 8 +-
mirall.desktop.in | 385 +++++++++++++-
.../dolphin/ownclouddolphinpluginhelper.cpp | 6 +-
src/cmd/cmd.cpp | 23 +-
src/gui/accountmanager.cpp | 12 +-
src/gui/accountsettings.cpp | 8 +-
src/gui/application.cpp | 18 +
src/gui/creds/shibboleth/shibbolethwebview.cpp | 15 +-
src/gui/folder.cpp | 40 +-
src/gui/folderman.cpp | 3 +-
src/gui/folderstatusmodel.cpp | 11 +-
src/gui/folderstatusmodel.h | 1 +
src/gui/folderwatcher_mac.cpp | 16 +-
src/gui/generalsettings.cpp | 8 -
src/gui/generalsettings.h | 1 -
src/gui/main.cpp | 2 +
src/gui/ocsjob.cpp | 23 +-
src/gui/owncloudgui.cpp | 20 +-
src/gui/protocolwidget.cpp | 16 +-
src/gui/sharelinkwidget.cpp | 2 +
src/gui/shareusergroupwidget.cpp | 12 +-
src/gui/socketapi.cpp | 2 +-
src/libsync/account.cpp | 53 +-
src/libsync/account.h | 4 +-
src/libsync/capabilities.cpp | 3 +-
src/libsync/connectionvalidator.cpp | 2 +-
src/libsync/excludedfiles.cpp | 3 +-
src/libsync/filesystem.cpp | 16 +-
src/libsync/filesystem.h | 6 +-
src/libsync/owncloudpropagator.cpp | 8 +
src/libsync/owncloudpropagator.h | 4 +
src/libsync/owncloudtheme.cpp | 2 +-
src/libsync/propagatedownload.cpp | 46 +-
src/libsync/propagateupload.cpp | 10 +-
src/libsync/syncengine.cpp | 17 +-
src/libsync/syncfilestatustracker.cpp | 17 +-
src/libsync/syncfilestatustracker.h | 1 -
src/libsync/theme.cpp | 2 +-
src/libsync/utility.h | 4 +-
test/testchecksumvalidator.cpp | 8 +-
test/testfolderwatcher.cpp | 8 +-
test/testxmlparse.cpp | 8 +-
translations/client_ca.ts | 438 ++++++++--------
translations/client_cs.ts | 360 ++++++-------
translations/client_de.ts | 358 ++++++-------
translations/client_el.ts | 448 ++++++++--------
translations/client_en.ts | 354 ++++++-------
translations/client_es.ts | 360 ++++++-------
translations/client_es_AR.ts | 354 ++++++-------
translations/client_et.ts | 354 ++++++-------
translations/client_eu.ts | 356 ++++++-------
translations/client_fa.ts | 354 ++++++-------
translations/client_fi.ts | 358 ++++++-------
translations/client_fr.ts | 358 ++++++-------
translations/client_gl.ts | 358 ++++++-------
translations/client_hu.ts | 358 ++++++-------
translations/client_it.ts | 358 ++++++-------
translations/client_ja.ts | 398 +++++++-------
translations/client_nb_NO.ts | 448 ++++++++--------
translations/client_nl.ts | 370 ++++++-------
translations/client_pl.ts | 400 +++++++-------
translations/client_pt.ts | 580 +++++++++++----------
translations/client_pt_BR.ts | 361 ++++++-------
translations/client_ru.ts | 360 ++++++-------
translations/client_sk.ts | 500 +++++++++---------
translations/client_sl.ts | 442 ++++++++--------
translations/client_sr.ts | 358 ++++++-------
translations/client_sv.ts | 432 +++++++--------
translations/client_th.ts | 460 ++++++++--------
translations/client_tr.ts | 438 ++++++++--------
translations/client_uk.ts | 364 ++++++-------
translations/client_zh_CN.ts | 390 +++++++-------
translations/client_zh_TW.ts | 356 ++++++-------
112 files changed, 7070 insertions(+), 6205 deletions(-)
diff --cc debian/changelog
index 1c2f300,3cfabe5..bd3d8f6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,20 @@@
+ owncloud-client (2.2.4+dfsg-1) unstable; urgency=medium
+
+ * new upstream release
+ * Change my own mailaddress to hefee at debian.org
+ * Added patch to compile with OpenSSL 1.1.0b (Closes: #828485)
+ * Add zlib to build deps.
+
+ -- Sandro Knauß <hefee at debian.org> Sat, 22 Oct 2016 00:47:06 +0200
+
+owncloud-client (2.2.2+dfsg-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Disable dolphin plugin as the needed dependencies are not available
+ in jessie.
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Thu, 14 Jul 2016 22:26:08 +0200
+
owncloud-client (2.2.2+dfsg-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index 5a466ac,1a85130..00f9270
--- a/debian/control
+++ b/debian/control
@@@ -10,12 -11,11 +10,13 @@@ Build-Depends: cmake
libcmocka-dev,
libhttp-dav-perl,
libinotify-dev [kfreebsd-any],
- libqt5webkit5-dev,
+ libneon27-gnutls-dev,
+ libqt4-dev,
+ libqtwebkit-dev,
+ libssl-dev (>> 1.0.0),
libsqlite3-dev,
libssl-dev (>> 1.0.0),
+ zlib1g-dev,
optipng,
pkg-kde-tools,
python-sphinx | python3-sphinx,
--
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