[Pkg-owncloud-commits] [owncloud-client] 01/05: Merge branch 'master' into jessie-backports
Gaudenz Steinlin
gaudenz at moszumanska.debian.org
Mon Nov 9 11:06:39 UTC 2015
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 aa6faf0572d8bd06b57b746fc523831c5f2a78bb
Merge: 7e0a5fd 3b9f7fc
Author: Gaudenz Steinlin <gaudenz at soziologie.ch>
Date: Sat Nov 7 12:47:24 2015 +0100
Merge branch 'master' into jessie-backports
Git-Dch: ignore
.tag | 2 +-
CMakeLists.txt | 12 +-
CONTRIBUTING.md | 6 +-
ChangeLog | 48 +
OWNCLOUD.cmake | 2 +-
README.md | 2 +-
VERSION.cmake | 2 +-
binary.rej | 5 -
cmake/modules/DefineCompilerFlags.cmake | 2 +-
cmake/modules/NSIS.template.in | 4 +-
cmake/modules/UseDoxygen.cmake | 2 +-
cmake/scripts/generate_lib_file | 4 +-
csync/ChangeLog | 10 +-
csync/INSTALL | 4 +-
csync/README | 2 +-
csync/src/csync.h | 2 +-
csync/src/csync_exclude.c | 365 ++--
csync/src/csync_exclude.h | 22 +
csync/src/csync_private.h | 8 +-
csync/src/csync_statedb.c | 2 +-
csync/src/csync_update.c | 13 +-
csync/src/std/c_path.c | 23 +-
csync/src/std/c_string.c | 19 +
csync/src/std/c_string.h | 13 +
csync/src/vio/csync_vio_local_win.c | 14 +-
csync/tests/csync_tests/check_csync_exclude.c | 119 ++
csync/tests/encoding_tests/check_encoding.c | 46 +-
debian/changelog | 13 +
debian/gbp.conf | 2 +
debian/libowncloudsync0.lintian-overrides | 2 +
debian/patches/0001-disable-updatecheck.patch | 12 +-
debian/patches/0007-move-translations.patch | 12 +-
debian/patches/series | 1 +
debian/patches/use_system_buildflags.patch | 21 +
debian/rules | 7 +-
doc/architecture.rst | 2 +-
doc/autoupdate.rst | 2 +-
doc/building.rst | 20 +-
doc/faq.rst | 2 +-
doc/images/client-1.png | Bin 0 -> 34342 bytes
doc/images/client-2.png | Bin 0 -> 41642 bytes
doc/images/client-3.png | Bin 0 -> 68758 bytes
doc/images/client-4.png | Bin 0 -> 64091 bytes
doc/images/client-7.png | Bin 0 -> 5865 bytes
doc/images/client1.png | Bin 45269 -> 0 bytes
doc/images/client2.png | Bin 48573 -> 0 bytes
doc/images/client3.png | Bin 43545 -> 0 bytes
doc/images/client4.png | Bin 102505 -> 0 bytes
doc/images/client5.png | Bin 42050 -> 0 bytes
doc/images/client6.png | Bin 60383 -> 53600 bytes
doc/images/ignored_files_editor.png | Bin 107117 -> 31193 bytes
doc/images/menu.png | Bin 40563 -> 4969 bytes
doc/images/settings_network.png | Bin 113591 -> 43075 bytes
doc/index.rst | 3 +-
doc/installing.rst | 116 +-
doc/introduction.rst | 38 +
doc/navigating.rst | 282 +--
doc/owncloudcmd.rst | 6 +-
doc/visualtour.rst | 2 +-
mirall.desktop.in | 1 +
.../doc/latex/ownCloudClientManual.tex | 227 --
shell_integration/dolphin/README | 4 +-
shell_integration/dolphin_kf5/README | 2 +-
shell_integration/nautilus/syncstate.py | 9 +-
src/cmd/CMakeLists.txt | 2 +-
src/cmd/cmd.cpp | 31 +-
src/crashreporter/CMakeLists.txt | 2 +-
src/gui/CMakeLists.txt | 1 -
src/gui/accountmanager.cpp | 12 +-
src/gui/accountmigrator.cpp | 89 -
src/gui/accountmigrator.h | 39 -
src/gui/accountsettings.cpp | 152 +-
src/gui/accountsettings.h | 3 +-
src/gui/accountsettings.ui | 130 +-
src/gui/accountstate.cpp | 29 +-
src/gui/accountstate.h | 6 +-
src/gui/application.cpp | 26 +-
src/gui/application.h | 3 +
src/gui/creds/shibboleth/shibbolethwebview.cpp | 10 +-
src/gui/folder.cpp | 40 +-
src/gui/folder.h | 3 +
src/gui/folderman.cpp | 65 +-
src/gui/folderman.h | 18 +-
src/gui/folderstatusdelegate.cpp | 2 +-
src/gui/folderstatusmodel.cpp | 93 +-
src/gui/folderstatusmodel.h | 10 +-
src/gui/folderwizard.cpp | 43 +-
src/gui/folderwizard.h | 4 +-
src/gui/generalsettings.cpp | 24 +-
src/gui/generalsettings.h | 1 +
src/gui/ignorelisteditor.cpp | 22 +-
src/gui/main.cpp | 4 +-
src/gui/owncloudgui.cpp | 98 +-
src/gui/owncloudgui.h | 3 +-
src/gui/owncloudsetupwizard.cpp | 6 +-
src/gui/settingsdialog.cpp | 19 +-
src/gui/settingsdialog.h | 1 -
src/gui/settingsdialog.ui | 26 +-
src/gui/sharedialog.cpp | 10 +-
src/gui/socketapi.cpp | 3 +-
src/gui/sslerrordialog.cpp | 5 +-
src/gui/sslerrordialog.ui | 16 +-
src/gui/updater/ocupdater.h | 2 +-
src/gui/updater/updater.cpp | 5 -
src/gui/updater/updater.h | 3 -
src/gui/wizard/owncloudadvancedsetuppage.cpp | 4 +-
src/gui/wizard/owncloudadvancedsetuppage.ui | 2 +-
src/gui/wizard/owncloudconnectionmethoddialog.h | 1 +
src/gui/wizard/owncloudsetuppage.cpp | 19 +-
src/gui/wizard/owncloudwizard.cpp | 2 -
src/gui/wizard/owncloudwizard.h | 2 -
src/libsync/account.cpp | 22 +-
src/libsync/account.h | 9 +-
src/libsync/configfile.cpp | 6 +-
src/libsync/connectionvalidator.cpp | 5 +-
src/libsync/discoveryphase.cpp | 4 +-
src/libsync/owncloudpropagator.cpp | 15 +-
src/libsync/owncloudpropagator.h | 10 +-
src/libsync/owncloudpropagator_p.h | 11 +-
src/libsync/propagatedownload.cpp | 3 +-
src/libsync/propagateremotedelete.cpp | 3 +-
src/libsync/propagateremotemkdir.cpp | 3 +-
src/libsync/propagateremotemove.cpp | 3 +-
src/libsync/propagateupload.cpp | 5 +-
src/libsync/propagatorjobs.cpp | 60 +-
src/libsync/propagatorjobs.h | 3 +
src/libsync/syncengine.cpp | 28 +-
src/libsync/syncjournaldb.cpp | 1 +
src/libsync/theme.cpp | 8 +-
src/libsync/theme.h | 13 +-
src/libsync/utility.cpp | 20 +-
src/libsync/utility_unix.cpp | 2 +-
test/scripts/README.rst | 6 +-
test/testfilesystem.h | 4 +-
test/testplan.txt | 8 +-
test/testutility.h | 24 +-
theme.qrc | 48 +-
theme/black/state-download-128.png | Bin 0 -> 1265 bytes
theme/black/state-download-16.png | Bin 0 -> 456 bytes
theme/black/state-download-256.png | Bin 0 -> 2490 bytes
theme/black/state-download-32.png | Bin 0 -> 819 bytes
theme/black/state-download-64.png | Bin 0 -> 732 bytes
theme/black/state-download.svg | 13 +
theme/black/state-error-128.png | Bin 0 -> 1297 bytes
theme/black/state-error-16.png | Bin 1455 -> 467 bytes
theme/black/state-error-256.png | Bin 0 -> 2575 bytes
theme/black/state-error-32.png | Bin 1964 -> 866 bytes
theme/black/state-error-64.png | Bin 3174 -> 734 bytes
theme/black/state-error.svg | 16 +
theme/black/state-information-128.png | Bin 0 -> 1218 bytes
theme/black/state-information-16.png | Bin 1396 -> 463 bytes
theme/black/state-information-256.png | Bin 0 -> 2307 bytes
theme/black/state-information-32.png | Bin 1757 -> 797 bytes
theme/black/state-information-64.png | Bin 1925 -> 725 bytes
theme/black/state-information.svg | 14 +
theme/black/state-offline-128.png | Bin 0 -> 1171 bytes
theme/black/state-offline-16.png | Bin 1430 -> 466 bytes
theme/black/state-offline-256.png | Bin 0 -> 2227 bytes
theme/black/state-offline-32.png | Bin 1810 -> 838 bytes
theme/black/state-offline-64.png | Bin 1712 -> 710 bytes
theme/black/state-offline.svg | 14 +
theme/black/state-ok-128.png | Bin 0 -> 1214 bytes
theme/black/state-ok-16.png | Bin 1390 -> 451 bytes
theme/black/state-ok-256.png | Bin 0 -> 2433 bytes
theme/black/state-ok-32.png | Bin 1903 -> 839 bytes
theme/black/state-ok-64.png | Bin 2619 -> 682 bytes
theme/black/state-ok.svg | 16 +
theme/black/state-pause-128.png | Bin 0 -> 1125 bytes
theme/black/state-pause-16.png | Bin 1380 -> 450 bytes
theme/black/state-pause-256.png | Bin 0 -> 2160 bytes
theme/black/state-pause-32.png | Bin 1686 -> 778 bytes
theme/black/state-pause-64.png | Bin 2224 -> 657 bytes
theme/black/state-pause.svg | 12 +
theme/black/state-sync-128.png | Bin 0 -> 1417 bytes
theme/black/state-sync-16.png | Bin 1427 -> 476 bytes
theme/black/state-sync-256.png | Bin 0 -> 2804 bytes
theme/black/state-sync-32.png | Bin 1963 -> 918 bytes
theme/black/state-sync-64.png | Bin 2695 -> 816 bytes
theme/black/state-sync.svg | 16 +
theme/black/state-warning-128.png | Bin 0 -> 1274 bytes
theme/black/state-warning-16.png | Bin 0 -> 449 bytes
theme/black/state-warning-256.png | Bin 0 -> 2487 bytes
theme/black/state-warning-32.png | Bin 0 -> 813 bytes
theme/black/state-warning-64.png | Bin 0 -> 752 bytes
theme/black/state-warning.svg | 16 +
theme/colored/owncloud-icon-128.png | Bin 8094 -> 4296 bytes
theme/colored/owncloud-icon-22.png | Bin 781 -> 713 bytes
theme/colored/owncloud-icon-256.png | Bin 18212 -> 9012 bytes
theme/colored/owncloud-icon-32.png | Bin 1305 -> 1061 bytes
theme/colored/owncloud-icon-48.png | Bin 2212 -> 1581 bytes
theme/colored/owncloud-icon-512.png | Bin 38334 -> 18391 bytes
theme/colored/owncloud-icon-64.png | Bin 3306 -> 2153 bytes
theme/colored/owncloud-icon.svg | 2217 ++++++++++++--------
theme/colored/state-download-256.png | Bin 18762 -> 17123 bytes
theme/colored/state-error-128.png | Bin 8855 -> 7123 bytes
theme/colored/state-error-256.png | Bin 19454 -> 17213 bytes
theme/colored/state-error-32.png | Bin 3252 -> 3226 bytes
theme/colored/state-error-64.png | Bin 5792 -> 5483 bytes
theme/colored/state-information-128.png | Bin 7600 -> 6295 bytes
theme/colored/state-information-256.png | Bin 17298 -> 15967 bytes
theme/colored/state-information-32.png | Bin 2963 -> 2938 bytes
theme/colored/state-information-64.png | Bin 4896 -> 4418 bytes
theme/colored/state-offline-128.png | Bin 6098 -> 4136 bytes
theme/colored/state-offline-16.png | Bin 1669 -> 1392 bytes
theme/colored/state-offline-256.png | Bin 12471 -> 9246 bytes
theme/colored/state-offline-32.png | Bin 2644 -> 2032 bytes
theme/colored/state-offline-64.png | Bin 4087 -> 3061 bytes
theme/colored/state-ok-128.png | Bin 9223 -> 7584 bytes
theme/colored/state-ok-256.png | Bin 20611 -> 18075 bytes
theme/colored/state-ok-32.png | Bin 3223 -> 3208 bytes
theme/colored/state-ok-64.png | Bin 5472 -> 5332 bytes
theme/colored/state-pause-128.png | Bin 8556 -> 7277 bytes
theme/colored/state-pause-256.png | Bin 18561 -> 17237 bytes
theme/colored/state-pause-32.png | Bin 3132 -> 3114 bytes
theme/colored/state-pause-64.png | Bin 5661 -> 5604 bytes
theme/colored/state-sync-128.png | Bin 10072 -> 8256 bytes
theme/colored/state-sync-256.png | Bin 22157 -> 19446 bytes
theme/colored/state-sync-32.png | Bin 3275 -> 3269 bytes
theme/colored/state-sync-64.png | Bin 5766 -> 5594 bytes
theme/colored/state-warning-128.png | Bin 8845 -> 7553 bytes
theme/colored/state-warning-256.png | Bin 19797 -> 18175 bytes
theme/white/state-download-128.png | Bin 0 -> 1157 bytes
theme/white/state-download-16.png | Bin 0 -> 360 bytes
theme/white/state-download-256.png | Bin 0 -> 2367 bytes
theme/white/state-download-32.png | Bin 0 -> 640 bytes
theme/white/state-download-64.png | Bin 0 -> 649 bytes
theme/white/state-download.svg | 15 +
theme/white/state-error-128.png | Bin 0 -> 1191 bytes
theme/white/state-error-16.png | Bin 1269 -> 370 bytes
theme/white/state-error-256.png | Bin 0 -> 2429 bytes
theme/white/state-error-32.png | Bin 1676 -> 735 bytes
theme/white/state-error-64.png | Bin 3033 -> 645 bytes
theme/white/state-error.svg | 18 +
theme/white/state-information-128.png | Bin 0 -> 1099 bytes
theme/white/state-information-16.png | Bin 1273 -> 358 bytes
theme/white/state-information-256.png | Bin 0 -> 2170 bytes
theme/white/state-information-32.png | Bin 1575 -> 644 bytes
theme/white/state-information-64.png | Bin 1817 -> 632 bytes
theme/white/state-information.svg | 16 +
theme/white/state-offline-128.png | Bin 0 -> 1069 bytes
theme/white/state-offline-16.png | Bin 1288 -> 295 bytes
theme/white/state-offline-256.png | Bin 0 -> 2073 bytes
theme/white/state-offline-32.png | Bin 1611 -> 671 bytes
theme/white/state-offline-64.png | Bin 1635 -> 612 bytes
theme/white/state-offline.svg | 14 +
theme/white/state-ok-128.png | Bin 0 -> 1174 bytes
theme/white/state-ok-16.png | Bin 1241 -> 366 bytes
theme/white/state-ok-256.png | Bin 0 -> 2346 bytes
theme/white/state-ok-32.png | Bin 1652 -> 724 bytes
theme/white/state-ok-64.png | Bin 2576 -> 668 bytes
theme/white/state-ok.svg | 14 +
theme/white/state-pause-128.png | Bin 0 -> 1034 bytes
theme/white/state-pause-16.png | Bin 1256 -> 360 bytes
theme/white/state-pause-256.png | Bin 0 -> 2037 bytes
theme/white/state-pause-32.png | Bin 1504 -> 651 bytes
theme/white/state-pause-64.png | Bin 2179 -> 600 bytes
theme/white/state-pause.svg | 14 +
theme/white/state-sync-128.png | Bin 0 -> 1287 bytes
theme/white/state-sync-16.png | Bin 1287 -> 304 bytes
theme/white/state-sync-256.png | Bin 0 -> 2599 bytes
theme/white/state-sync-32.png | Bin 1662 -> 743 bytes
theme/white/state-sync-64.png | Bin 2585 -> 704 bytes
theme/white/state-sync.svg | 18 +
theme/white/state-warning-128.png | Bin 0 -> 1174 bytes
theme/white/state-warning-16.png | Bin 0 -> 355 bytes
theme/white/state-warning-256.png | Bin 0 -> 2300 bytes
theme/white/state-warning-32.png | Bin 0 -> 675 bytes
theme/white/state-warning-64.png | Bin 0 -> 656 bytes
theme/white/state-warning.svg | 16 +
translations/client_ca.ts | 843 ++++----
translations/client_cs.ts | 809 +++----
translations/client_de.ts | 949 +++++----
translations/client_el.ts | 821 ++++----
translations/client_en.ts | 764 +++----
translations/client_es.ts | 953 +++++----
translations/client_es_AR.ts | 925 ++++----
translations/client_et.ts | 821 ++++----
translations/client_eu.ts | 793 +++----
translations/client_fa.ts | 1154 +++++-----
translations/client_fi.ts | 871 ++++----
translations/client_fr.ts | 835 ++++----
translations/client_gl.ts | 823 ++++----
translations/client_hu.ts | 1025 ++++-----
translations/client_it.ts | 807 +++----
translations/client_ja.ts | 827 ++++----
translations/client_nb_NO.ts | 958 +++++----
translations/client_nl.ts | 824 ++++----
translations/client_pl.ts | 885 ++++----
translations/client_pt.ts | 845 ++++----
translations/client_pt_BR.ts | 853 ++++----
translations/client_ru.ts | 832 ++++----
translations/client_sk.ts | 922 ++++----
translations/client_sl.ts | 839 ++++----
translations/client_sr.ts | 879 ++++----
translations/client_sv.ts | 799 +++----
translations/client_th.ts | 821 ++++----
translations/client_tr.ts | 960 +++++----
translations/client_uk.ts | 811 +++----
translations/client_zh_CN.ts | 837 ++++----
translations/client_zh_TW.ts | 799 +++----
300 files changed, 17056 insertions(+), 15241 deletions(-)
diff --cc debian/changelog
index 30a3edc,fdfed13..943964c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,16 +1,31 @@@
+ owncloud-client (2.0.2+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update patch hunks
+ * Added patch to use system build flags.
+ * Added override hardening-no-fortify-functions for libowncloudsync0
+ * Updated debian/rules:
+ - use /usr/share/dpkg/default.mk
+ - remove own hacks to get debian version
+ - use hardening=+all
+
+ -- Sandro Knauß <bugs at sandroknauss.de> Sat, 24 Oct 2015 03:16:40 +0200
+
+owncloud-client (2.0.0+dfsg-1~bpo8+2) jessie-backports; urgency=medium
+
+ * Build with QT 4 to fix issues with the GNOME system tray icon on QT 5 <
+ 5.4.x.
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Tue, 08 Sep 2015 11:48:02 +0200
+
+owncloud-client (2.0.0+dfsg-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Add libneon27-gnutls-dev as build-dependency. This is needed because
+ jessie is not built with qtbase 5.4.x
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Mon, 07 Sep 2015 17:34:25 +0200
+
owncloud-client (2.0.0+dfsg-1) unstable; urgency=medium
* New upstream release (release to unstable).
--
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