[Pkg-owncloud-commits] [owncloud-client] 01/02: Merge tag 'debian/2.1.1+dfsg-1' into jessie-backports
Gaudenz Steinlin
gaudenz at moszumanska.debian.org
Tue Mar 8 17:30:11 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 68322b95160e6e64e0aa3486df9c0571edb33bc2
Merge: c943324 98f2ba6
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date: Mon Mar 7 21:21:30 2016 +0100
Merge tag 'debian/2.1.1+dfsg-1' into jessie-backports
.gitmodules | 3 +
.tag | 2 +-
CMakeLists.txt | 7 -
ChangeLog | 77 +-
README.md | 2 +-
VERSION.cmake | 4 +-
client.qrc | 2 +
cmake/modules/DefineInstallationPaths.cmake | 5 -
cmake/modules/FindNeon.cmake | 73 -
cmake/modules/QtVersionAbstraction.cmake | 19 +-
config.h.in | 4 -
csync/ConfigureChecks.cmake | 1 -
csync/config_csync.h.cmake | 5 -
csync/src/CMakeLists.txt | 16 -
csync/src/csync.c | 50 +-
csync/src/csync.h | 32 +-
csync/src/csync_exclude.c | 104 +-
csync/src/csync_macros.h | 1 +
csync/src/csync_misc.c | 13 +-
csync/src/csync_owncloud.c | 617 -------
csync/src/csync_owncloud.h | 36 -
csync/src/csync_owncloud_private.h | 115 --
csync/src/csync_owncloud_util.c | 125 --
csync/src/csync_private.h | 16 +-
csync/src/csync_reconcile.c | 8 +-
csync/src/csync_statedb.c | 59 +-
csync/src/csync_update.c | 199 ++-
csync/src/csync_util.c | 1 +
csync/src/httpbf/CMakeLists.txt | 57 -
csync/src/httpbf/README | 29 -
csync/src/httpbf/client/CMakeLists.txt | 36 -
csync/src/httpbf/client/httpbf_client.c | 225 ---
csync/src/httpbf/src/CMakeLists.txt | 38 -
csync/src/httpbf/src/httpbf.c | 688 --------
csync/src/httpbf/src/httpbf.h | 142 --
csync/src/httpbf/tests/CMakeLists.txt | 18 -
csync/src/httpbf/tests/church.jpg | Bin 1278765 -> 0 bytes
csync/src/httpbf/tests/hbf_send_test.c | 162 --
csync/src/vio/csync_vio.c | 6 -
csync/src/vio/csync_vio_local_unix.c | 10 -
csync/src/vio/csync_vio_local_win.c | 153 +-
csync/tests/CMakeLists.txt | 5 -
csync/tests/csync_tests/check_csync_exclude.c | 38 +-
csync/tests/csync_tests/check_csync_update.c | 7 +-
csync/tests/httpbf_tests/hbf_send_test.c | 241 ---
csync/tests/ownCloud/ownCloud/Test.pm | 28 +-
csync/tests/ownCloud/t9.pl | 91 +
csync/tests/vio_tests/check_vio.c | 52 -
debian/changelog | 18 +
debian/copyright | 21 +-
debian/libowncloudsync0.lintian-overrides | 2 -
debian/patches/0001-disable-updatecheck.patch | 14 +-
debian/patches/0002-debian_version.patch | 16 +-
.../patches/0004-shell_integration_copyright.patch | 19 -
...lags.patch => 0004-use_system_buildflags.patch} | 0
debian/patches/0005-remove_admin.patch | 6 +-
debian/patches/0006-move-configfile.patch | 12 +-
debian/patches/0007-move-translations.patch | 16 +-
debian/patches/series | 3 +-
doc/advancedusage.rst | 8 +-
doc/autoupdate.rst | 30 +-
doc/building.rst | 115 +-
doc/conf.py.in | 8 +-
doc/images/client-7.png | Bin 5865 -> 4439 bytes
doc/images/client-8.png | Bin 0 -> 83622 bytes
doc/images/client-9.png | Bin 0 -> 53065 bytes
doc/images/client10.png | Bin 40245 -> 0 bytes
doc/images/client6.png | Bin 53600 -> 50517 bytes
doc/images/client7.png | Bin 42112 -> 0 bytes
doc/images/client8.png | Bin 44898 -> 0 bytes
doc/images/client9.png | Bin 59958 -> 0 bytes
doc/images/mac-share.png | Bin 0 -> 59496 bytes
doc/images/menu.png | Bin 4969 -> 101298 bytes
doc/images/share-1.png | Bin 0 -> 18267 bytes
doc/images/share-2.png | Bin 0 -> 24573 bytes
doc/installing.rst | 6 +-
doc/introduction.rst | 43 +-
doc/logo-blue.pdf | Bin 1849 -> 1851 bytes
doc/navigating.rst | 191 ++-
doc/owncloudcmd.1.rst | 18 +
doc/owncloudcmd.rst | 37 +-
doc/visualtour.rst | 12 +-
resources/delete.png | Bin 0 -> 243 bytes
resources/more.png | Bin 0 -> 122 bytes
shell_integration/CMakeLists.txt | 14 +-
.../dolphin/0001-KOverlayIconPlugin.patch | 256 ---
shell_integration/dolphin/CMakeLists.txt | 53 +-
shell_integration/dolphin/README | 15 +-
.../dolphin/ownclouddolphinactionplugin.cpp | 66 +
.../dolphin/ownclouddolphinactionplugin.desktop | 6 +
.../dolphin/ownclouddolphinoverlayplugin.cpp | 101 ++
.../dolphin/ownclouddolphinoverlayplugin.json | 8 +
.../dolphin/ownclouddolphinplugin.cpp | 131 --
.../dolphin/ownclouddolphinplugin.desktop | 6 -
.../dolphin/ownclouddolphinpluginhelper.cpp | 98 ++
.../dolphin/ownclouddolphinpluginhelper.h | 52 +
.../dolphin_kf5/0001-KOverlayIconPlugin.patch | 267 ---
shell_integration/dolphin_kf5/CMakeLists.txt | 30 -
shell_integration/dolphin_kf5/README | 16 -
.../dolphin_kf5/ownclouddolphinplugin.cpp | 131 --
.../dolphin_kf5/ownclouddolphinplugin.desktop | 6 -
.../icons/nopadding/SVG/attention.svg | 72 +-
shell_integration/icons/nopadding/SVG/error.svg | 75 +-
.../icons/nopadding/SVG/generate_windows_ico.sh | 8 +
shell_integration/icons/nopadding/SVG/ok.svg | 59 +-
shell_integration/icons/nopadding/SVG/shared.svg | 109 +-
shell_integration/icons/nopadding/SVG/sync.svg | 103 +-
shell_integration/nautilus/CMakeLists.txt | 14 +-
shell_integration/nautilus/createnemoplugin.sh | 6 +
shell_integration/nautilus/setappname.sh | 2 +-
shell_integration/nautilus/syncstate.py | 96 +-
src/cmd/cmd.cpp | 66 +-
src/gui/CMakeLists.txt | 22 +-
src/gui/accountmanager.cpp | 10 +
src/gui/accountmanager.h | 11 +-
src/gui/accountsettings.cpp | 217 ++-
src/gui/accountsettings.h | 8 +-
src/gui/accountsettings.ui | 50 +-
src/gui/accountstate.cpp | 69 +-
src/gui/accountstate.h | 20 +-
src/gui/activityitemdelegate.cpp | 164 ++
...lderstatusdelegate.h => activityitemdelegate.h} | 40 +-
src/gui/activitywidget.cpp | 496 ++++++
src/gui/activitywidget.h | 202 +++
src/gui/activitywidget.ui | 45 +
src/gui/application.cpp | 93 +-
src/gui/application.h | 3 +
src/gui/clipboard.mm | 16 +
src/gui/creds/httpcredentialsgui.cpp | 26 +-
src/gui/creds/httpcredentialsgui.h | 3 +-
src/gui/creds/shibboleth/shibbolethrefresher.cpp | 55 -
src/gui/creds/shibboleth/shibbolethrefresher.h | 53 -
src/gui/creds/shibboleth/shibbolethuserjob.cpp | 7 +-
src/gui/creds/shibboleth/shibbolethuserjob.h | 2 +-
src/gui/creds/shibbolethcredentials.cpp | 139 +-
src/gui/creds/shibbolethcredentials.h | 15 +-
src/gui/folder.cpp | 130 +-
src/gui/folder.h | 20 +-
src/gui/folderman.cpp | 108 +-
src/gui/folderman.h | 15 +-
src/gui/folderstatusdelegate.cpp | 174 +-
src/gui/folderstatusdelegate.h | 8 +-
src/gui/folderstatusmodel.cpp | 290 +++-
src/gui/folderstatusmodel.h | 41 +-
src/gui/folderwatcher.cpp | 88 +-
src/gui/folderwatcher.h | 26 +-
src/gui/folderwatcher_linux.cpp | 3 +-
src/gui/folderwatcher_mac.cpp | 2 +-
src/gui/folderwizard.cpp | 4 +-
src/gui/folderwizardtargetpage.ui | 15 +-
src/gui/generalsettings.cpp | 17 +-
src/gui/generalsettings.h | 4 +-
src/gui/generalsettings.ui | 91 +-
src/gui/ignorelisteditor.cpp | 4 +
src/gui/logbrowser.cpp | 2 +-
src/gui/main.cpp | 23 +
src/gui/networksettings.cpp | 21 +
src/gui/networksettings.ui | 10 +-
src/gui/ocsjob.cpp | 124 ++
src/gui/ocsjob.h | 131 ++
src/gui/ocsshareejob.cpp | 46 +
src/gui/ocsshareejob.h | 55 +
src/gui/ocssharejob.cpp | 137 ++
src/gui/ocssharejob.h | 127 ++
src/gui/owncloudgui.cpp | 99 +-
src/gui/owncloudgui.h | 3 +
src/gui/owncloudsetupwizard.cpp | 4 +-
src/gui/protocolwidget.cpp | 170 +-
src/gui/protocolwidget.h | 17 +-
src/gui/protocolwidget.ui | 92 +-
src/gui/proxyauthhandler.h | 2 +-
src/gui/quotainfo.cpp | 7 +-
src/gui/quotainfo.h | 6 +-
src/gui/selectivesyncdialog.cpp | 29 +-
src/gui/selectivesyncdialog.h | 4 +-
src/gui/settingsdialog.cpp | 131 +-
src/gui/settingsdialog.h | 11 +-
src/gui/settingsdialog.ui | 26 +-
src/gui/settingsdialogmac.cpp | 25 +-
src/gui/settingsdialogmac.h | 7 +-
src/gui/share.cpp | 325 ++++
src/gui/share.h | 291 ++++
src/gui/sharedialog.cpp | 756 +--------
src/gui/sharedialog.h | 104 +-
src/gui/sharedialog.ui | 210 +--
src/gui/sharee.cpp | 226 +++
src/gui/sharee.h | 92 +
src/gui/sharelinkwidget.cpp | 543 ++++++
src/gui/sharelinkwidget.h | 115 ++
src/gui/{sharedialog.ui => sharelinkwidget.ui} | 247 ++-
src/gui/shareusergroupwidget.cpp | 431 +++++
src/gui/shareusergroupwidget.h | 132 ++
src/gui/shareusergroupwidget.ui | 66 +
src/gui/sharewidget.ui | 104 ++
src/gui/socketapi.cpp | 180 +-
src/gui/socketapi.h | 11 +-
src/gui/sslbutton.cpp | 5 +-
src/gui/synclogdialog.cpp | 52 +
.../capabilities.h => gui/synclogdialog.h} | 37 +-
src/gui/synclogdialog.ui | 38 +
src/gui/syncrunfilelog.cpp | 3 +
src/gui/systray.mm | 19 +
src/gui/thumbnailjob.cpp | 40 +
src/gui/thumbnailjob.h | 51 +
src/gui/updater/ocupdater.cpp | 6 +-
src/gui/updater/ocupdater.h | 8 +-
src/gui/wizard/owncloudadvancedsetuppage.cpp | 3 +-
src/gui/wizard/owncloudhttpcredspage.cpp | 19 +
src/gui/wizard/owncloudwizardresultpage.cpp | 2 +-
src/libsync/CMakeLists.txt | 25 +-
src/libsync/abstractnetworkjob.cpp | 19 +-
src/libsync/abstractnetworkjob.h | 7 +-
src/libsync/accessmanager.cpp | 7 +-
src/libsync/account.cpp | 43 +-
src/libsync/account.h | 9 +-
src/libsync/bandwidthmanager.cpp | 4 +-
src/libsync/capabilities.cpp | 63 +-
src/libsync/capabilities.h | 22 +-
src/libsync/checksums.cpp | 249 +++
src/libsync/checksums.h | 138 ++
src/libsync/clientproxy.cpp | 33 -
src/libsync/clientproxy.h | 1 -
src/libsync/configfile.cpp | 21 +-
src/libsync/configfile.h | 3 +-
src/libsync/connectionvalidator.cpp | 32 +-
src/libsync/connectionvalidator.h | 18 +-
src/libsync/creds/abstractcredentials.h | 26 +-
src/libsync/creds/credentialscommon.cpp | 47 -
src/libsync/creds/credentialscommon.h | 7 -
src/libsync/creds/dummycredentials.cpp | 13 +-
src/libsync/creds/dummycredentials.h | 6 +-
src/libsync/creds/httpcredentials.cpp | 191 +--
src/libsync/creds/httpcredentials.h | 12 +-
src/libsync/creds/tokencredentials.cpp | 58 +-
src/libsync/creds/tokencredentials.h | 6 +-
src/libsync/discoveryphase.cpp | 44 +-
src/libsync/discoveryphase.h | 21 +-
src/libsync/excludedfiles.cpp | 80 +
src/libsync/excludedfiles.h | 74 +
src/libsync/filesystem.cpp | 116 +-
src/libsync/filesystem.h | 39 +-
src/libsync/logger.cpp | 33 +-
src/libsync/logger.h | 1 +
src/libsync/networkjobs.cpp | 128 +-
src/libsync/networkjobs.h | 65 +-
src/libsync/owncloudpropagator.cpp | 247 +--
src/libsync/owncloudpropagator.h | 81 +-
src/libsync/owncloudpropagator_p.h | 11 +-
src/libsync/ownsql.cpp | 7 +
src/libsync/ownsql.h | 3 +
src/libsync/progressdispatcher.cpp | 55 +-
src/libsync/progressdispatcher.h | 10 +-
src/libsync/propagatedownload.cpp | 158 +-
src/libsync/propagatedownload.h | 21 +-
src/libsync/propagateremotedelete.cpp | 2 +-
src/libsync/propagateremotemkdir.cpp | 31 +-
src/libsync/propagateremotemkdir.h | 13 +-
src/libsync/propagateremotemove.cpp | 11 +-
src/libsync/propagateupload.cpp | 195 ++-
src/libsync/propagateupload.h | 28 +-
src/libsync/propagator_legacy.cpp | 735 --------
src/libsync/propagator_legacy.h | 161 --
src/libsync/propagatorjobs.cpp | 49 +-
src/libsync/propagatorjobs.h | 15 +-
src/libsync/syncengine.cpp | 227 ++-
src/libsync/syncengine.h | 23 +-
src/libsync/syncfileitem.h | 26 +-
src/libsync/syncfilestatus.cpp | 2 +-
src/libsync/syncfilestatus.h | 2 +-
src/libsync/syncjournaldb.cpp | 221 ++-
src/libsync/syncjournaldb.h | 35 +-
src/libsync/syncjournalfilerecord.cpp | 54 +-
src/libsync/syncjournalfilerecord.h | 12 +-
src/libsync/theme.cpp | 19 +-
src/libsync/theme.h | 1 +
src/libsync/transmissionchecksumvalidator.cpp | 151 --
src/libsync/transmissionchecksumvalidator.h | 80 -
src/libsync/utility.cpp | 64 +-
src/libsync/utility.h | 20 +-
sync-exclude.lst | 40 +-
test/CMakeLists.txt | 15 +-
test/owncloud_add_test.cmake | 2 +
test/test_journal.db | Bin 57344 -> 57344 bytes
...checksumvalidator.h => testchecksumvalidator.h} | 64 +-
test/testcsyncsqlite.h | 10 -
test/testexcludedfiles.h | 50 +
test/testowncloudpropagator.h | 15 +
test/testownsql.h | 4 +-
test/testsyncjournaldb.h | 60 +-
translations/client_ca.ts | 1284 ++++++++------
translations/client_cs.ts | 1284 ++++++++------
translations/client_de.ts | 1286 ++++++++------
translations/client_el.ts | 1286 ++++++++------
translations/client_en.ts | 1207 ++++++++------
translations/client_es.ts | 1306 +++++++++------
translations/client_es_AR.ts | 1244 ++++++++------
translations/client_et.ts | 1304 +++++++++------
translations/client_eu.ts | 1454 +++++++++-------
translations/client_fa.ts | 1264 ++++++++------
translations/client_fi.ts | 1326 ++++++++-------
translations/client_fr.ts | 1294 ++++++++------
translations/client_gl.ts | 1282 ++++++++------
translations/client_hu.ts | 1272 ++++++++------
translations/client_it.ts | 1284 ++++++++------
translations/client_ja.ts | 1372 ++++++++-------
translations/client_nb_NO.ts | 1282 ++++++++------
translations/client_nl.ts | 1286 ++++++++------
translations/client_pl.ts | 1276 ++++++++------
translations/client_pt.ts | 1296 ++++++++------
translations/client_pt_BR.ts | 1294 ++++++++------
translations/client_ru.ts | 1284 ++++++++------
translations/client_sk.ts | 1284 ++++++++------
translations/client_sl.ts | 1372 ++++++++-------
translations/client_sr.ts | 1346 ++++++++-------
translations/client_sv.ts | 1403 +++++++++-------
translations/client_th.ts | 1298 +++++++++------
translations/client_tr.ts | 1360 ++++++++-------
translations/client_uk.ts | 1334 ++++++++-------
translations/client_zh_CN.ts | 1286 ++++++++------
translations/client_zh_TW.ts | 1760 +++++++++++---------
320 files changed, 33828 insertions(+), 26087 deletions(-)
diff --cc debian/changelog
index b765a03,7750723..faab1fa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,21 +1,29 @@@
+ owncloud-client (2.1.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Updated patch hunks
+
+ -- Sandro Knauß <bugs at sandroknauss.de> Wed, 17 Feb 2016 11:00:56 +0100
+
+ owncloud-client (2.1.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Delete non used patch: 004-shell_integration_copyright
+ * Updated patch hunks
+ * Updated patches (small updates)
+ * Remove unnessary lintian-override
+ * Updated copyright file
+
+ -- Sandro Knauß <bugs at sandroknauss.de> Tue, 15 Dec 2015 18:48:08 +0100
+
+owncloud-client (2.0.2+dfsg-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Add myself as uploader for the jessie backport
+ * Build with -std=gnu11 to avoid compile errors
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Sun, 08 Nov 2015 23:17:38 +0100
+
owncloud-client (2.0.2+dfsg-1) unstable; urgency=medium
* New upstream release.
--
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