VERSION.cmake: 2.2.4 final

2026-04-03 18:11:32 +02:00 · 2016-09-27 10:53:37 +02:00
1305 changed files with 84031 additions and 224875 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,63 +0,0 @@
-# Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
-#
-# You may use this file under the terms of the 3-clause BSD license.
-# See the file LICENSE from this package for details.
-
-# This is the clang-format configuration style to be used by Qt,
-# based on the rules from https://wiki.qt.io/Qt_Coding_Style and
-# https://wiki.qt.io/Coding_Conventions
-
---
-# Webkit style was loosely based on the Qt style
-BasedOnStyle: WebKit
-
-Standard: Cpp11
-ColumnLimit: 0
-
-# Disable reflow of qdoc comments: indentation rules are different.
-# Translation comments are also excluded
-CommentPragmas: "^!|^:"
-
-# We want a space between the type and the star for pointer types
-PointerBindsToType: false
-
-# We want to break before the operators, but not before a '='
-BreakBeforeBinaryOperators: NonAssignment
-
-# Braces are usually attached, but not after functions or classes declaration
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterClass: true
-    AfterControlStatement: false
-    AfterEnum: false
-    AfterFunction: true
-    AfterNamespace: false
-    AfterObjCDeclaration: false
-    AfterStruct: true
-    AfterUnion: false
-    BeforeCatch: false
-    BeforeElse: false
-    IndentBraces: false
-
-# The coding style does not specify the following, but this is what gives
-# results closest to the existing code.
-AlignAfterOpenBracket: DontAlign
-AlwaysBreakTemplateDeclarations: true
-
-# Ideally we should also allow less short function in a single line, but
-# clang-format does not handle that
-AllowShortFunctionsOnASingleLine: Inline
-
-# The coding style specifies some include order categories, but also tells to
-# separate categories with an empty line. It does not specify the order within
-# the categories. Since the SortInclude feature of clang-format does not
-# re-order includes separated by empty lines, the feature is not used.
-SortIncludes: false
-
-# macros for which the opening brace stays attached
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
-
-# Allow two empty lines for structuring
-MaxEmptyLinesToKeep: 2
-KeepEmptyLinesAtTheStartOfBlocks: false
-
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,228 +0,0 @@
-clone:
-  git:
-    image: plugins/git
-    tags: true
-    depth: 1
-
-pipeline:
-    qt-5.7:
-        image: nextcloudci/client-5.7:client-5.7-3
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              source /opt/qt57/bin/qt57-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              source /opt/qt57/bin/qt57-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1  ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.7
-    qt-5.8:
-        image: nextcloudci/client-5.8:client-5.8-3
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              source /opt/qt58/bin/qt58-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              source /opt/qt58/bin/qt58-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.8
-    qt-5.9:
-        image: nextcloudci/client-5.9:client-5.9-4
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              source /opt/qt59/bin/qt59-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              source /opt/qt59/bin/qt59-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.9
-    qt-5.10:
-        image: nextcloudci/client-5.10:client-5.10-3
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              export CC=gcc-7 &&
-              export CXX=g++-7 &&
-              source /opt/qt510/bin/qt510-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              export CC=gcc-7 &&
-              export CXX=g++-7 &&
-              source /opt/qt510/bin/qt510-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.10
-    qt-5.11:
-        image: nextcloudci/client-5.11:client-5.11-3
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              export CC=gcc-7 &&
-              export CXX=g++-7 &&
-              source /opt/qt511/bin/qt511-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              export CC=gcc-7 &&
-              export CXX=g++-7 &&
-              source /opt/qt511/bin/qt511-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.11
-
-    qt-5.11-clang:
-        image: nextcloudci/client-5.11:client-5.11-3
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              export CC=clang-6.0 &&
-              export CXX=clang++-6.0 &&
-              source /opt/qt511/bin/qt511-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              export CC=clang-6.0 &&
-              export CXX=clang++-6.0 &&
-              source /opt/qt511/bin/qt511-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.11-clang
-
-    AppImage:
-        image: nextcloudci/client-5.11:client-5.11-3
-        commands:
-            - /bin/bash -c "./admin/linux/build-appimage.sh"
-        when:
-            matrix:
-                BUILD: AppImage
-
-    Debian:
-        image: nextcloudci/client-debian-ci:client-debian-ci-2
-        commands:
-            - /bin/bash -c "./admin/linux/debian/drone-build.sh"
-        secrets: [ DEBIAN_SECRET_KEY, DEBIAN_SECRET_IV ]
-        when:
-            matrix:
-                BUILD: Debian
-
-    documentation:
-        image: nextcloudci/documentation:documentation-5
-        commands:
-            - cd doc
-            - make html
-        when:
-            matrix:
-                TESTS: documentation
-
-matrix:
-    include:
-        - TESTS: qt-5.7
-        - TESTS: qt-5.8
-        - TESTS: qt-5.9
-        - TESTS: qt-5.10
-        - TESTS: qt-5.11
-        - TESTS: qt-5.11-clang
-        - BUILD: AppImage
-        - BUILD: Debian
-        - TESTS: documentation
-
-branches: [ master, 2.* ]
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1 +0,0 @@
-c8d0f788e00bdae125a26d9159ce9efdd6325cd2 # Initial application of clang-format
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "doc/ocdoc"]
+	path = doc/ocdoc
+	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
 	url = https://github.com/guruz/qtmacgoodies.git
@@ -7,3 +10,6 @@
 [submodule "src/3rdparty/libcrashreporter-qt"]
 	path = src/3rdparty/libcrashreporter-qt
 	url = git://github.com/dschmidt/libcrashreporter-qt.git
+[submodule "src/3rdparty/qtkeychain"]
+	path = src/3rdparty/qtkeychain
+	url = https://github.com/frankosterfeld/qtkeychain.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,37 @@
+sudo: required
+
+language: cpp
+
+services:
+  - docker
+
+branches:
+  only:
+  - coverity_scan 
+
+before_install:
+- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_14.04/Release.key
+- sudo apt-key add - < Release.key
+- sudo apt-get update
+- sudo apt-get -y build-dep owncloud-client
+- checkout=$(git show-ref --head --hash head)
+- cd ../
+- wget https://scan.coverity.com/download/linux-64 --post-data "token=$token&project=owncloud%2Fmirall" -O coverity_tool.tgz
+- mkdir coverity
+- tar -xvf coverity_tool.tgz -C coverity --strip-components=1
+- export PATH=$PATH:$PWD/coverity/bin/
+- cd $TRAVIS_BUILD_DIR
+
+install:
+- cd ../
+- mkdir client-build
+- cd client-build
+- cmake -DCMAKE_BUILD_TYPE="Debug" $TRAVIS_BUILD_DIR
+- cov-build --dir cov-int make
+- tar czvf client.tgz cov-int 
+- curl --form token=$token --form email=lukas@statuscode.ch --form file=@$PWD/client.tgz --form version="$checkout" --form description="$checkout" https://scan.coverity.com/builds?project=owncloud%2Fmirall
+
+# Hack to stop processing
+script: true
--- a/.tx/config
+++ b/.tx/config
@@ -1,16 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = bg_BG: bg, cs_CZ: cs, de_DE: de, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja, pt_PT: pt, et_EE: et
-
-[nextcloud.client]
-host = https://www.transifex.com
-source_lang = en
-source_file = translations/client_en.ts
-file_filter = translations/client_<lang>.ts
-type = QT
-
-[nextcloud.client-desktop]
-host = https://www.transifex.com
-source_file = mirall.desktop.in
-source_lang = en
-type = DESKTOP
--- a/.tx/nextcloud.client-desktop/cs_translation
+++ b/.tx/nextcloud.client-desktop/cs_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[cs_CZ]=@APPLICATION_NAME@ desktopový synchronizační klient
-Icon[cs_CZ]=@APPLICATION_EXECUTABLE@
-Name[cs_CZ]=@APPLICATION_NAME@ desktopový synchronizační klient
-GenericName[cs_CZ]=Synchronizace složek
--- a/.tx/nextcloud.client-desktop/de_translation
+++ b/.tx/nextcloud.client-desktop/de_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
-Icon[de_DE]=@APPLICATION_EXECUTABLE@
-Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
-GenericName[de_DE]=Synchronisationsordner
--- a/.tx/nextcloud.client-desktop/en_GB_translation
+++ b/.tx/nextcloud.client-desktop/en_GB_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
-Icon[en_GB]=@APPLICATION_EXECUTABLE@
-Name[en_GB]=@APPLICATION_NAME@ desktop sync client 
-GenericName[en_GB]=Folder Sync
--- a/.tx/nextcloud.client-desktop/es_CL_translation
+++ b/.tx/nextcloud.client-desktop/es_CL_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_CL]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_CL]=@APPLICATION_EXECUTABLE@
-Name[es_CL]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_CL]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_CO_translation
+++ b/.tx/nextcloud.client-desktop/es_CO_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_CO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_CO]=@APPLICATION_EXECUTABLE@
-Name[es_CO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_CO]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_CR_translation
+++ b/.tx/nextcloud.client-desktop/es_CR_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_CR]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_CR]=@APPLICATION_EXECUTABLE@
-Name[es_CR]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_CR]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_DO_translation
+++ b/.tx/nextcloud.client-desktop/es_DO_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_DO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_DO]=@APPLICATION_EXECUTABLE@
-Name[es_DO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_DO]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_EC_translation
+++ b/.tx/nextcloud.client-desktop/es_EC_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_EC]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_EC]=@APPLICATION_EXECUTABLE@
-Name[es_EC]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_EC]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_GT_translation
+++ b/.tx/nextcloud.client-desktop/es_GT_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_GT]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_GT]=@APPLICATION_EXECUTABLE@
-Name[es_GT]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_GT]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_MX_translation
+++ b/.tx/nextcloud.client-desktop/es_MX_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_MX]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_MX]=@APPLICATION_EXECUTABLE@
-Name[es_MX]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_MX]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_SV_translation
+++ b/.tx/nextcloud.client-desktop/es_SV_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_SV]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_SV]=@APPLICATION_EXECUTABLE@
-Name[es_SV]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_SV]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_translation
+++ b/.tx/nextcloud.client-desktop/es_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
-Icon[es]=@APPLICATION_EXECUTABLE@
-Name[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
-GenericName[es]=Sincronización de carpetas
--- a/.tx/nextcloud.client-desktop/fr_translation
+++ b/.tx/nextcloud.client-desktop/fr_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[fr]=Client  desktop de synchronisation @APPLICATION_NAME@
-Icon[fr]=@APPLICATION_EXECUTABLE@
-Name[fr]=Client  desktop de synchronisation @APPLICATION_NAME@
-GenericName[fr]=Synchronisation du dossier
--- a/.tx/nextcloud.client-desktop/he_translation
+++ b/.tx/nextcloud.client-desktop/he_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה
-Icon[he]=@APPLICATION_EXECUTABLE@
-Name[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה 
-GenericName[he]=סנכרון תיקיות
--- a/.tx/nextcloud.client-desktop/hr_translation
+++ b/.tx/nextcloud.client-desktop/hr_translation
@@ -1,203 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[hr]=klijent za sinkronizaciju računala
-Name[hr]=sinkronizacija računala
-GenericName[hr]=Sinkronizacija mapa
--- a/.tx/nextcloud.client-desktop/is_translation
+++ b/.tx/nextcloud.client-desktop/is_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[is]=@APPLICATION_NAME@ forrit til samstillingar við tölvu
-Icon[is]=@APPLICATION_EXECUTABLE@
-Name[is]=@APPLICATION_NAME@ forrit til samstillingar við tölvu
-GenericName[is]=Samstilling á möppum
--- a/.tx/nextcloud.client-desktop/it_translation
+++ b/.tx/nextcloud.client-desktop/it_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@ 
-Icon[it]=@APPLICATION_EXECUTABLE@
-Name[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@ 
-GenericName[it]=Sincronizzazione cartelle
--- a/.tx/nextcloud.client-desktop/ja_translation
+++ b/.tx/nextcloud.client-desktop/ja_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-Icon[ja_JP]=@APPLICATION_EXECUTABLE@
-Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-GenericName[ja_JP]=フォルダーを同期する
--- a/.tx/nextcloud.client-desktop/pt_BR_translation
+++ b/.tx/nextcloud.client-desktop/pt_BR_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
-Icon[pt_BR]=@APPLICATION_EXECUTABLE@
-Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
-GenericName[pt_BR]=Sincronizar Pasta
--- a/.tx/nextcloud.client-desktop/ru_translation
+++ b/.tx/nextcloud.client-desktop/ru_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[ru]=Клиент синхронизации @APPLICATION_NAME@ для ПК
-Icon[ru]=@APPLICATION_EXECUTABLE@
-Name[ru]=@APPLICATION_NAME@  клиент для ПК
-GenericName[ru]=Синхронизация папок
--- a/.tx/nextcloud.client-desktop/sr_translation
+++ b/.tx/nextcloud.client-desktop/sr_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
-Icon[sr]=@APPLICATION_EXECUTABLE@
-Name[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
-GenericName[sr]=Синхронизација фасцикли
--- a/.tx/nextcloud.client-desktop/tr_translation
+++ b/.tx/nextcloud.client-desktop/tr_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
-Icon[tr]=@APPLICATION_EXECUTABLE@
-Name[tr]=@APPLICATION_NAME@ masaüstü eşiteme istemcisi
-GenericName[tr]=Klasör Eşitleme
--- a/.tx/nextcloud.client-desktop/zh_TW_translation
+++ b/.tx/nextcloud.client-desktop/zh_TW_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
-Icon[zh_TW]=@APPLICATION_EXECUTABLE@
-Name[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
-GenericName[zh_TW]=資料夾同步
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,14 @@
-cmake_minimum_required(VERSION 3.2)
-set(CMAKE_CXX_STANDARD 14)
+
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(VERSION 2.8.0)

 project(client)

-set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
 set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
 if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     include ( ${OEM_THEME_DIR}/OEM.cmake )
 else ()
-     include ( ${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake )
+     include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
 endif()
 # need this logic to not mess with re/uninstallations via macosx.pkgproj
 if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient")
@@ -18,19 +17,16 @@ else()
    set(APPLICATION_REV_DOMAIN_INSTALLER ${APPLICATION_REV_DOMAIN})
 endif()

+if (NOT DEFINED APPLICATION_SHORTNAME)
+     set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
+endif()
+
 # For usage in XML files we preprocess
 string(REPLACE "&" "&amp;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME}")
 string(REPLACE "<" "&lt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
 string(REPLACE ">" "&gt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")

-if (NOT DEFINED LINUX_PACKAGE_SHORTNAME)
-    set(LINUX_PACKAGE_SHORTNAME "${APPLICATION_SHORTNAME}")
-endif()
-
-if (NOT DEFINED PACKAGE)
-    set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client")
-endif()
-
+set(PACKAGE "${APPLICATION_SHORTNAME}-client")
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )

 if(NOT CRASHREPORTER_EXECUTABLE)
@@ -40,13 +36,7 @@ endif()
 include(Warnings)

 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
-# For config.h
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-# Allows includes based on src/ like #include "common/utility.h" or #include "csync/csync.h"
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_BINARY_DIR}/src
-)

 # disable the crashreporter if libcrashreporter-qt is not available or we're building for ARM
 if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/libcrashreporter-qt/CMakeLists.txt")
@@ -57,24 +47,26 @@ if(NOT WITH_CRASHREPORTER)
    message(STATUS "Build of crashreporter disabled.")
 endif()

+#####
+## handle DBUS for Fdo notifications
+if( UNIX AND NOT APPLE )
+    add_definitions( -DUSE_FDO_NOTIFICATIONS)
+    set(WITH_DBUS ON)
+endif()
+####
+
 include(GNUInstallDirs)
 include(DefineInstallationPaths)
-include(GenerateExportHeader)
+

 include(GetGitRevisionDescription)

 get_git_head_revision(GIT_REFSPEC GIT_SHA1)

-add_definitions(
-    -DQT_USE_QSTRINGBUILDER
-    -DQT_MESSAGELOGCONTEXT #enable function name and line number in debug output
-    -DQT_DEPRECATED_WARNINGS
-)
-
 # if we cannot get it from git, directly try .tag (packages)
 # this will work if the tar balls have been properly created
 # via git-archive.
-if ("${GIT_SHA1}" STREQUAL "GITDIR-NOTFOUND")
+if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
    file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
    string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
    if (NOT ${sha1_candidate} STREQUAL "$Format:%H$")
@@ -123,22 +115,7 @@ if(NO_MSG_HANDLER)
   add_definitions(-DNO_MSG_HANDLER=1)
 endif()

-# this option builds the shell integration
-option(BUILD_SHELL_INTEGRATION "BUILD_SHELL_INTEGRATION" ON)
-
-# this option builds/installs the generic shell integration icons
-option(BUILD_SHELL_INTEGRATION_ICONS "BUILD_SHELL_INTEGRATION_ICONS" ON)
-
-# this options builds the dolphin integration plugin
-option(BUILD_SHELL_INTEGRATION_DOLPHIN "BUILD_SHELL_INTEGRATION_DOLPHIN" ON)
-
-# this options builds the nautilus (like) integration plugins
-option(BUILD_SHELL_INTEGRATION_NAUTILUS "BUILD_SHELL_INTEGRATION_NAUTILUS" ON)
-
-# this option builds the client
-option(BUILD_CLIENT "BUILD_CLIENT" ON)
-
-# this option creates only libocsync and libowncloudsync (NOTE: BUILD_CLIENT needs to be on)
+# this option creates only libocsync and libowncloudsync
 option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)

 # When this option is enabled, 5xx errors are not added to the blacklist
@@ -159,79 +136,57 @@ if(OWNCLOUD_RESTORE_RENAME)
    add_definitions(-DOWNCLOUD_RESTORE_RENAME=1)
 endif()

-# Disable shibboleth.
-# So the client can be built without QtWebKit
-option(NO_SHIBBOLETH "Build without Shibboleth support. Allow to build the client without QtWebKit" OFF)
-if(NO_SHIBBOLETH)
-   message("Compiling without shibboleth")
-   add_definitions(-DNO_SHIBBOLETH=1)
-endif()

 if(APPLE)
  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()

-if(BUILD_CLIENT)
-    if(APPLE)
-        find_package(Sparkle)
-        find_package(FUSE REQUIRED)
-        include_directories(BEFORE ${FUSE_INCLUDE_DIR})
-    endif(APPLE)
+find_package(OpenSSL 1.0.0 REQUIRED)

-    if(UNIX)
-        find_package(INotify REQUIRED)
-    else()
-        find_package(INotify)
-    endif()
-    find_package(Sphinx)
-    find_package(PdfLatex)
-    find_package(OpenSSL 1.1  REQUIRED)
+if(APPLE)
+  find_package(Sparkle)
+endif(APPLE)

-   find_package(ZLIB REQUIRED)
-   find_package(GLib2)
-   find_package(Gio)
-   find_package(Libcloudproviders)
+if(UNIX)
+  find_package(INotify REQUIRED)
+else()
+  find_package(INotify)
+endif()
+find_package(Sphinx)
+find_package(PdfLatex)
+
+find_package(SQLite3 3.8.0 REQUIRED)
+# On some OS, we want to use our own, not the system sqlite
+if (USE_OUR_OWN_SQLITE3)
+    include_directories(BEFORE ${SQLITE3_INCLUDE_DIR})
 endif()

-if (NOT DEFINED APPLICATION_ICON_NAME)
-    set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
-endif()
+find_package(ZLIB)

-include(NextcloudCPack.cmake)
+configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+configure_file(test/test_journal.db "${CMAKE_BINARY_DIR}/test/test_journal.db" COPYONLY)
+
+include(OwnCloudCPack.cmake)

 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
 if( WIN32 )
 add_definitions( -D__USE_MINGW_ANSI_STDIO=1 )
-add_definitions( -DNOMINMAX )
-# Get APIs from from Vista onwards.
-add_definitions( -D_WIN32_WINNT=0x0600)
-add_definitions( -DWINVER=0x0600)
 endif( WIN32 )

-if (APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-endif()
-
 # Handle Translations, pick all client_* files from trans directory.
 file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})

-if(BUILD_CLIENT)
-    add_subdirectory(src)
-    if(NOT BUILD_LIBRARIES_ONLY)
-        add_subdirectory(man)
-        add_subdirectory(doc)
-        add_subdirectory(doc/dev)
-        if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
-            add_subdirectory(admin)
-        endif(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
-    endif(NOT BUILD_LIBRARIES_ONLY)
-endif()
-
-if(BUILD_SHELL_INTEGRATION)
-    add_subdirectory(shell_integration)
-endif()
+add_subdirectory(csync)
+add_subdirectory(src)
+if(NOT BUILD_LIBRARIES_ONLY)
+add_subdirectory(shell_integration)
+add_subdirectory(doc)
+add_subdirectory(doc/dev)
+add_subdirectory(admin)
+endif(NOT BUILD_LIBRARIES_ONLY)

 if(UNIT_TESTING)
    include(CTest)
@@ -239,15 +194,10 @@ if(UNIT_TESTING)
    add_subdirectory(test)
 endif(UNIT_TESTING)

-configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
-
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
    install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
    configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
-    configure_file(LoopbackFS.icns bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/LoopbackFS.icns COPYONLY)
-elseif(BUILD_CLIENT)
+else()
    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
    configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
-    configure_file(LoopbackFS.icns bin/LoopbackFS.icns COPYONLY)
 endif()
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,18 +1,20 @@
 ## Submitting Desktop Client issues

-If you have questions about how to use the Nextcloud Desktop Client, please
-visit our [support site][support] or our [forum][forum].
+If you have questions about how to use the ownCloud Desktop Client, please
+direct these to the [mailing list][mailinglist] or our [forum][forum].
 We are also available on [IRC][irc].

 ### Bug Reporting Guidelines
 * __Important__: Report the issue using our [template][template], it includes all the
  information we need to track down the issue.  
-* __SECURITY__: Report any potential security bug by following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker
-* This repository is *only* for issues within the Nextcloud desktop client. 
+* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
+* This repository is *only* for issues within the ownCloud desktop client. 
  Issues in other components should be reported in their own repositores: 
-  - [Nextcloud server](https://github.com/nextcloud/server/issues)
-  - [Android client](https://github.com/nextcloud/android/issues)
-  - [iOS client](https://github.com/nextcloud/ios/issues)
+  - [ownCloud server](https://github.com/owncloud/core/issues)
+  - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
+    Contacts...)
+  - [Android client](https://github.com/owncloud/android/issues)
+  - [iOS client](https://github.com/owncloud/ios-issues/issues)
 * Search the existing issues first, it's likely that your issue was already
  reported.

@@ -21,20 +23,27 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue.
 Help us to maximize the effort we can spend fixing issues and adding new
 features, by not reporting duplicate issues.

-[template]: https://raw.githubusercontent.com/nextcloud/appstore/master/.github/issue_template.md
-[support]: https://nextcloud.com/support/
-[forum]: https://help.nextcloud.com/categories
-[irc]: https://webchat.freenode.net/?channels=nextcloud
+[template]: https://raw.github.com/owncloud/client/master/issue_template.md
+[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
+[forum]: http://forum.owncloud.org/
+[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4

 ## Contributing to Source Code

-Thanks for wanting to contribute source code to Nextcloud. That's great!
+Thanks for wanting to contribute source code to ownCloud. That's great!

-You do not need to sign a Contributor Agreement, but we ask that you follow our 
-[Code of Conduct](https://nextcloud.com/code-of-conduct/).
+Before we're able to merge your code to ownCloud Desktop Client, you need to sign
+our [Contributor Agreement][agreement].

-Please read the [Contribution Guide](https://nextcloud.com/contribute/) to get 
-started.
+Please read the [Desktop Client Manual][desktopman] and the [Developer
+Manuals][devmanual] to get useful info like how to create your first
+application or how to test the ownCloud code with phpunit.
+
+[agreement]: http://owncloud.org/about/contributor-agreement/
+[devmanual]: http://owncloud.org/dev
+[desktopman]: http://doc.owncloud.org/desktop

 ## Translations
-Please submit translations via [Transifex](https://www.transifex.com/nextcloud/nextcloud/).
+Please submit translations via [Transifex][transifex].
+
+[transifex]: https://www.transifex.com/projects/p/owncloud/
--- a/CPackOptions.cmake.in
+++ b/CPackOptions.cmake.in
@@ -14,7 +14,7 @@ set( OEM_THEME_DIR     @OEM_THEME_DIR@ )
 if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     include ( ${OEM_THEME_DIR}/OEM.cmake )
 else ()
-     include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" )
+     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
 endif()

 set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
--- a/197
+++ b/197
@@ -1,189 +1,6 @@
 ChangeLog
 =========

-version 2.4.1 (2017-02-xx)
-* Ignore files with file names that can't be encoded for the filesystem (#6287, #5676, #5719)
-* Issues: Speed up insertion and add hard upper limit (#6272)
-* Notifications: Fix "Dismiss" action
-* Notifications: Fix timer invocation on macOS
-* Notifications: Immediately poll when account online
-* Protocol: Remove entries for auto resolved conflicts (#6316)
-* owncloudcmd: Set proxy before capabilities call (#6281)
-* owncloudcmd: Do not do the capability call when --nonshib is passed
-* Avatars: Use old location for servers <10 (#6279)
-* Link shares: Change default share name (#6298)
-* Nautilus integration: Work with python2 and python3
-* HTTP2: Only allow with Qt 5.9.4 (#6285)
-* Crash fixes
-
-version 2.4.0 (2017-12-21)
-* If you're using 2.4.0 alpha1, please upgrade as previous alphas/rcs had an issue with hidden files and renames!
-* OAuth2 authentication support by opening external browser (#5668)
-* Shibboleth: Change to use OAuth2 if supported (#6198)
-* Sharing: Add support for multiple public link shares (#5655)
-* Sharing: Add option to copy/email private links (#5023, #5627)
-* Sharing: Add option "show file listing" (#5837)
-* Sharing: Show warning that links are public (#5747)
-* Sharing: Sharing dialog redesign: multiple share links support (#5695)
-* Sharing: Make "can edit" partially checked sometimes (#5642)
-* Sharing: Trigger a sync for folder affected by a change of sharing (#6098)
-* Wizard: Never propose an existing folder for syncing (#5597)
-* Wizard: Don't show last page anymore, go to settings directly (#5726)
-* Wizard: Handle url-shortener redirects (#5954)
-* Wizard: Resolve url/ redirects only if url/status.php not found (#5954)
-* Wizard: Add explanation text when server error is shown (#6157)
-* Wizard: Update the window size on high dpi screen (#6156)
-* Wizard: Don't report confusing error message (#6116)
-* Gui: Display the user server avatar (#5482)
-* Gui: Use display name of user, not internal name
-* Server URL: Update configuration in case of permanent redirection (#5972)
-* Gui: Allow to add multiple sync folder connection of the same folder (#6032)
-* Tray Menu: More detailed status messages
-* Tray Menu: Shibboleth: raise the browser when clicking on the tray (#6105)
-* Activity: Link errors from the account tab, allow filtering by account/folder (#5861)
-* Activity: Present conflicts more prominently (#5894)
-* Activity: Allow sorting the columns in issues and protocol tabs (#6093, #6086)
-* Selective Sync: Open sub folder context menu (#5596)
-* Selective Sync: Skip excluded folders when reading db (#5772)
-* Selective Sync: Remove local files of unselected folder despite other modified files (#5783)
-* Excludes: Remove .htaccess form list of excluded files (#5701)
-* Excludes: Hardcode desktop.ini
-* Excludes: Allow escaping "#" (#6012)
-* Excludes: Use faster matching via QRegularExpression (#6063)
-* Discovery: Increase the MAX_DEPTH and show deep folders as ignored (#1067)
-* Discovery: General speed improvements
-* Downloads: Remove empty temporary if disk space full (#5746)
-* Downloads: Read Content-MD5 header for object store setups
-* Checksums: Add global disable environment variable (#5017)
-* Quota: PropagateUpload: Model of remote quota, avoid some uploads (#5537)
-* Create favorite also in folder wizard (#455)
-* Windows: Use the application icon for the Windows 8 sidebar favorite (#2446, #5690)
-* macOS: Finder sidebar icon (#296)
-* Overlay Icons: Consider also the "shared by me" as shared (#4788)
-* Overlay Icons: Update right after sharing (#6115)
-* Overlay Icons: Fix different case paths not matching (#5257)
-* Overlay Icons: Detect changes in the shared flag (#6098)
-* Windows Overlay Icons: Potential hang fixes
-* Linux Overlay Icons: fix branded nemo and caja shell integration (#5966)
-* Credentials: Fix behavior for bad password (#5989)
-* Credentials: Don't create empty client cert keychain entries (#5752)
-* Credentials: Namespace windows cred keys (#6125)
-* Credentials: Use per-account keychain entries (#5830, #6126)
-* AccountSettings: Triggering log in re-ask about previously rejected certificates (#5819)
-* owncloudcmd: Added bandwidth limit parameter (#5707)
-* owncloudcmd: Fix timestamps, Fix --logdebug
-* AccountSettings: Sync with clean discovery on Ctrl-F6 (#5666)
-* Sync: Dynamic sizing of chunks in chunked uploads for improved big file upload performance (#5852)
-* Sync: Introduce overall errors that are not tied to a file (#5746)
-* Sync: Better messaging for 507 Insufficient Storage (#5537)
-* Sync: Create conflicts by comparing the hash of files with identical mtime/size (#5589)
-* Sync: Avoid downloads by comparing the hash of files with identical mtime/size (#6153)
-* Sync: Upload conflict files if OWNCLOUD_UPLOAD_CONFLICT_FILES environment variable is set (#6038)
-* Sync: Blacklist: Don't let errors become warnings (#5516)
-* Sync: Check etag again after active sync (#4116)
-* Sync: Rename handling fixes: duplicate file ids (#6096, #6212)
-* Sync: Rename handling fixes: File size must be equal
-* Sync: Rename handling: Fix duplicate files on abort/resume sync (#5949)
-* Sync: Add capability for invalid filename regexes (#6092)
-* SyncJournalDB: Fall back to DELETE journal mode if WAL mode does not seem to work (#5723)
-* SyncJournalDB: Don't crash if the db file is readonly (#6050)
-* SyncJournalDB: DB close error is not fatal
-* Fix at least one memory leak
-* Documentation improvements
-* Logging improvements (With Qt logging categories) (#5671)
-* Logging filtering per account (#5672)
-* Crash fixes
-* Test improvements
-* Small UI layout fixes
-* Performance improvements
-* Maintenance Mode: Detect maintenance mode (#4485)
-* Maintenance Mode: Add a 1 to 5 min reconnection delay (#5872)
-* HTTP: Send a unique X-Request-ID with each request (#5853)
-* HTTP: Support HTTP2 when built and running with Qt 5.9.x (Official packages still on Qt 5.6.x) (#5659)
-* owncloudcmd: Don't start if connection or auth fails (#5692)
-* csync: Switch build from C to C++ (#6033)
-* csync: Refactor a lot to use common data structures to save memory and memory copying
-* csync: Switch some data structures to Qt data structures
-* csync: Switch to using upper layer SyncJournalDB (#6087)
-* Switch 3rdparty/json usage to Qt5's QJson (#5710)
-* OpenSSL: Don't require directly, only via Qt (#5833)
-* Remove iconv dependency, use Qt for file system locale encoding/decoding (emoji filename support on macOS) (#5875)
-* Compilation: Remove Qt 4 code (#6025, #5702, #5505)
-* Harmonize source code style with clang-format (#5732)
-* Switch over to Qt 5 function pointer signal/slot syntax (#6041)
-* Compile with stack-smashing protection
-* Updater: Rudimentary support for beta channel (#6048)
-
-version 2.3.4 (2017-11-02)
-* Checksums: Use addData function to avoid endless loop CPU load issues with Office files
-* Packaging: Require ZLIB
-
-version 2.3.3 (2017-08-29)
-* Chunking NG: Don't use old chunking on new DAV endpoint (#5855)
-* Selective Sync: Skip excluded folders when reading DB, don't let them show errors (#5772)
-* Settings: Make window bigger so Qt version is always visible (#5760)
-* Share links: Show warning that public link shares are public (#5786)
-* Downloads: Re-trigger folder discovery on HTTP 404 (#5799)
-* Overlay Icons: Fix potential hangs on Windows
-* SyncJournalDB: Don't use ._ as filename pattern if that does not work because of SMB storage settings (#5844)
-* SyncJournalDB: Log reason for sqlite3 opening errors
-* Notifications: Proapgate "Dismiss" button action to server (#5922)
-* Switch Linux build also to Qt 5.6.2 (#5470)
-* Stopped maintaining Qt 4 buildability
-
-version 2.3.2 (2017-05-08)
-* Fix more crashes (thanks to everyone submitting to our crash reporter!)
-* Improve compatibility with server 10.0 (#5691, X-OC-Total-Size)
-* Share dialog: UI improvements, Bring to front on tray click
-* owncloudcmd: Align process return value with sync return value (#3936)
-* Fix disk free check on Windows when opening the local DB
-
-version 2.3.1 (2017-03-21)
-* Fix several crashes (thanks to everyone submitting to our crash reporter!)
-* Improve HTTP redirect handling (#5555)
-* Blacklist: Escalate repeated soft error to normal error (#5500)
-* NTFS: Do not attempt to upload two existing files with similar casing (#5544)
-* Fix URL for linking to application password generation for ownCloud 10.0 (#5605)
-
-version 2.3.0 (2017-03-03)
-* Decreased memory usage during sync
-* Overlay icons: Lower CPU usage
-* Allow to not sync the server's external storages by default
-* Switch Windows and OS X build to Qt 5.6.2
-* Switch to new ownCloud server WebDAV endpoint
-* Chunking NG: New file upload chunking algorithmn for ownCloud server 9.2
-* Allow to sync a folder to multiple different servers (Filename change from .csync_journal.db to _sync_$HASH.db)
-* Conflicts: Use the local mtime for the conflict file name (#5273)
-* "Sync now" menu item
-* SSL Client certificate support improved (Show UI, Store keys in keychain)
-* Propagator: Upload more small files in parallel
-* Sync Engine: Read data-fingerprint property to detect backups (#2325)
-* GUI: Show link to ceate an app password/token for syncing
-* Share dialog: Add 'Mail link' button
-* Caja file manager plugin
-* Make "backup detected" message to not trigger in wrong cases
-* SyncEngine: Fix renaming of folder when file are changed (#5192)
-* Fix reconnect bug if status.php intermittently returns wrong data (#5188)
-* Improve sync scheduling (#5317)
-* Overlay icons: Improvements in correctnes
-* Tray menu: Only update on demand to fix Linux desktop integration glitches
-* Progress: Better time/bandwidth estimations
-* Network: Follow certain HTTP redirects (#2791)
-* Network: Remove all cookies (including load balancers etc) when logging out
-* Discovery thread: Low priority
-* owncloudsync.log: Write during propagation
-* Better error message for files with trailing spaces on Windows
-* Excludes: Consider files in hidden folders excluded (#5163)
-* Allow sync directory to be a symlinked directory
-* Add manifest file on Windows to make the application UAC aware
-* macOS: Improve monochrome tray icons
-* Shibboleth bugfixes
-* Fixes with regards to low disk space
-* A ton of other bugfixes
-* Refactorings
-* Improved documentation
-* Crash fixes
-
 version 2.2.4 (release 2016-09-27)
 * Dolphin Plugin: Use the Application name for the socket path (#5172)
 * SyncEngine: Fix renaming of folder when file are changed (#5195)
@@ -219,7 +36,7 @@ version 2.2.2 (release 2016-06-21)
 version 2.2.1 (release 2016-06-06)
 * Fix out of memory error when too many uploads happen (#4611)
 * Fix display errors in progress display (#4803 #4856)
- * LockWatcher: Remember to upload files after they become unlocked (#4865)
+ * LockWatcher: Remember to upload files after they become unlocked (#4865) 
 * Fix overlay icons for files with umlauts (#4884)
 * Certs: Re-ask for different cert after rejection (#4898, #4911)
 * Progress: Don't count items without propagation jobs (#4856, #4910)
@@ -245,6 +62,7 @@ version 2.2.0 (release 2016-05-12)
 * Documentation Improvements, ie. about overlay icons
 * Translation fixes
 * Countless other bugfixes
+ * Sqlite Update to recent version
 * Update of QtKeyChain to support Windows credential store
 * Packaging of dolphin overlay icon module for bleeding edge distros

@@ -276,7 +94,7 @@ version 2.1 (release 2015-12-03)
 * GUI: Improved upload/download progress UI (#3403, #3569)
 * Allowed sharing with ownCloud internal users and groups from Desktop
 * Changed files starting in .* to be considered hidden on all platforms (#4023)
- * Reflect read-only permissions in filesystem (#3244)
+ * Reflect read-only permissions in filesystem (#3244)  
 * Blacklist: Clear on successful chunk upload (#3934)
 * Improved reconnecting after network change/disconnect (#4167 #3969 ...)
 * Improved performance in Windows file system discovery
@@ -315,6 +133,7 @@ version 2.1 (release 2015-12-03)
 * Fixed getting size for selective sync (#3986)
 * Re-added close button in the settings window (#3713)
 * Added abililty to handle storage limitations gracefully (#3736)
+ * Updated 3rdparty dependencies: sqlite version 3.9.1
 * Organized patches to our base Qt version into admin/qt/patches
 * Plus: A lot of unmentioned improvements and fixes

@@ -350,7 +169,7 @@ version 2.0.2 (release 2015-10-21)
  * ShareDialog: Fix folder display (#3659)
  * AccountSettings: Restore from legacy only once (#3565)
  * SSL Certificate Error Dialog: show account name (#3729)
-  * Tray notification: Don't show a message about modified folder (#3613)
+  * Tray notification: Don't show a message about modified folder (#3613) 
  * PropagateLocalRemove:  remove entries from the DB even if there was an error.
  * Settings UI improvements (eg. #3713, #3721, #3619 and others)
  * Folder: Do not create the sync folder if it does not exist (#3692)
@@ -981,7 +800,7 @@ version 1.1.1 (release 2012-10-18), csync 0.60.1 required
               directory, away from the .csync dir.
  *         Renamed exclude.lst to sync-exclude.lst and moved it to
            /etc/appName()/ for more clean packaging. From the user path,
-            still exclude.lst is read if sync-exclude.lst is not existing.
+	    still exclude.lst is read if sync-exclude.lst is not existing.
  *         Placed custom.ini with customization options to /etc/appName()

 version 1.0.5 (release 2012-08-14), csync 0.50.8 required
@@ -1001,8 +820,8 @@ version 1.0.4 (release 2012-08-10), csync 0.50.8 required
  * [GUI] Proxy configuration dialog added.
  * [GUI] Added Translations to languages Slovenian, Polish, Catalan,
          Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak,
-          French, Russian, Japanese, Swedish, Portuguese (Portugal)
-          all with translation rate >90%.
+	  French, Russian, Japanese, Swedish, Portuguese (Portugal)
+	  all with translation rate >90%.
  * [Fixes] Loading of self signed certs into Networkmanager (#oc-843)
  * [Fixes] Win32: Handle SSL dll loading correctly.
  * [Fixes] Many other small fixes and improvements.
--- a/58
+++ b/58
@@ -0,0 +1,58 @@
+#!groovy
+
+node('CLIENT') {
+    stage 'Checkout'
+        checkout scm
+        sh '''git submodule update --init'''
+
+    stage 'Qt4'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt4 - clang'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt5'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt5 - clang'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
+		make
+		ctest --output-on-failure'''
+
+
+    stage 'Win32'
+	def win32 = docker.image('deepdiver/docker-owncloud-client-win32:latest')
+	win32.pull() // make sure we have the latest available from Docker Hub
+	win32.inside {
+		sh '''
+		rm -rf build-win32
+		mkdir build-win32
+		cd build-win32
+		../admin/win/download_runtimes.sh
+		cmake .. -DCMAKE_TOOLCHAIN_FILE=../admin/win/Toolchain-mingw32-openSUSE.cmake -DWITH_CRASHREPORTER=ON
+		make -j4
+		make package
+		ctest .
+		'''
+	}
+}
+
+
--- a/LoopbackFS.icns
+++ b/LoopbackFS.icns
--- a/NEXTCLOUD.cmake
+++ b/NEXTCLOUD.cmake
@@ -1,24 +0,0 @@
-set( APPLICATION_NAME       "Nextcloud" )
-set( APPLICATION_SHORTNAME  "Nextcloud" )
-set( APPLICATION_EXECUTABLE "nextcloud" )
-set( APPLICATION_DOMAIN     "nextcloud.com" )
-set( APPLICATION_VENDOR     "Nextcloud GmbH" )
-set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE string "URL for updater" )
-set( APPLICATION_ICON_NAME  "Nextcloud" )
-
-set( LINUX_PACKAGE_SHORTNAME "nextcloud" )
-
-set( THEME_CLASS            "NextcloudTheme" )
-set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
-set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
-
-set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
-
-# set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
-# set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
-
-option( WITH_CRASHREPORTER "Build crashreporter" OFF )
-#set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
-#set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
-
-option( WITH_PROVIDERS "Build with providers list" ON )
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -0,0 +1,18 @@
+set( APPLICATION_NAME       "ownCloud" )
+set( APPLICATION_EXECUTABLE "owncloud" )
+set( APPLICATION_DOMAIN     "owncloud.com" )
+set( APPLICATION_VENDOR     "ownCloud" )
+set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string "URL for updater" )
+
+set( THEME_CLASS            "ownCloudTheme" )
+set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
+set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
+
+set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
+
+# set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
+# set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
+
+option( WITH_CRASHREPORTER "Build crashreporter" OFF )
+set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
+set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
--- a/NextcloudCPack.cmake
+++ b/NextcloudCPack.cmake
@@ -5,7 +5,7 @@ set( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     include ( "${OEM_THEME_DIR}/OEM.cmake" )
 else ()
-     include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" )
+     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
 endif()

 include( VERSION.cmake )
@@ -19,7 +19,7 @@ if(APPLE)
    set( CPACK_GENERATOR "DragNDrop" )
    set( CPACK_SOURCE_GENERATOR "")
    set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION} )
-    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/${APPLICATION_ICON_NAME}.icns)
+    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)

    set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
 #    set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
@@ -48,7 +48,7 @@ if(WIN32)
    set( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project     /path/to/project/ReadMe.txt
    set( CPACK_PACKAGE_DESCRIPTION_SUMMARY  "${APPLICATION_NAME} Syncing Client" ) #  Description summary of a project
    # CPACK_PACKAGE_EXECUTABLES   List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts.     ccmake;CMake
-    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_SHORTNAME} )     # Installation directory on the target system -> C:\Program Files\${APPLICATION_SHORTNAME}
+    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_SHORTNAME} )     # Installation directory on the target system -> C:\Program Files\fellody
    set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_SHORTNAME} )  # Registry key used when installing this project  CMake 2.5.0
    set( CPACK_PACKAGE_NAME  ${APPLICATION_NAME} ) # Package name, defaults to the project name
    set( CPACK_PACKAGE_VENDOR  "http://${APPLICATION_DOMAIN}" )   # Package vendor name
--- a/README.md
+++ b/README.md
@@ -1,94 +1,65 @@
-# Nextcloud Desktop Client
+# ownCloud Desktop Client

-The :computer: Nextcloud Desktop Client is a tool to synchronize files from Nextcloud Server
+| Job                               | State                                                                                                                                                             |
+|-----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| client-build-matrix               | [![Build Status](https://ci.owncloud.org/job/client-build-matrix-linux/badge/icon)](https://ci.owncloud.org/job/client-build-matrix-linux/)                       |
+| client-test-matrix-linux-no-build | [![Build Status](https://ci.owncloud.org/buildStatus/icon?job=client-test-matrix-linux-no-build)](https://ci.owncloud.org/job/client-test-matrix-linux-no-build/) |
+| coverity_scan | [![Build Status](https://img.shields.io/coverity/scan/2482.svg)](https://scan.coverity.com/projects/owncloud-mirall)
+
+## Introduction
+
+The ownCloud Desktop Client is a tool to synchronize files from ownCloud Server
 with your computer.

-<p align="center">
-    <img src="https://nextcloud.com/wp-content/themes/next/assets/img/clients/desktop/macsettings.png?x16328" alt="Desktop Client on Mac OS]">
-</p>
+## Download

-## :blue_heart: :tada: Contributing
+### Binary packages

-### :hammer_and_wrench: How to compile the desktop client
+* Refer to the download page https://owncloud.org/install/#install-clients

-:building_construction: [System requirements](https://github.com/nextcloud/desktop/wiki/System-requirements-for-compiling-the-desktop-client) includes OpenSSL 1.1.x, QtKeychain, Qt 5.x.x and zlib.
+### Source code

-#### :memo: Step by step instructions
-
-##### Clone the repo and create build directory
-```
-$ git clone git@github.com:nextcloud/desktop.git
-$ cd desktop
-$ mkdir build
-```
-##### Compile and install
-
-##### Linux
-
-```
-$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
-$ make install
-```
-
-##### Windows
-
-```
-$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
-$ cmake --build . --config Debug --target install
-```
-
-##### Mac OS
-
-```
-$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
-$ make install
-```
-
-More detailed instructions can be found at the [Desktop Client Wiki](https://github.com/nextcloud/desktop/wiki).
-
-### :inbox_tray: Where to find binaries to download
-
-#### :high_brightness: Daily builds
-
- Daily builds based on the latest master are available for Linux :penguin:, Mac, and Windows
-[in the desktop/daily folder of our download server](https://download.nextcloud.com/desktop/daily).
-For more info: [Wiki/Daily Builds](https://github.com/nextcloud/desktop/wiki/Daily-Builds).
-
-#### :rocket: Releases
-
- Refer to the [download page https://nextcloud.com/install/#install-clients](https://nextcloud.com/install/#install-clients)
-
-### :bomb: Reporting issues
-
- If you find any bugs or have any suggestion for improvement, please
-file an issue at https://github.com/nextcloud/client/issues. Do not
-contact the authors directly by mail, as this increases the chance
-of your report being lost. :boom:
-
-### :smiley: :trophy: Pull requests
-
- If you created a patch :heart_eyes:, please submit a [Pull
-Request](https://github.com/nextcloud/client/pulls).
-
-## :satellite: Contact us
-
-If you want to contact us, e.g. before starting a more complex feature, for questions :question:
-you can join us at
-[#nextcloud-client](https://webchat.freenode.net/?channels=nextcloud-client).
-
-## :v: Code of conduct
-
-The Nextcloud community has core values that are shared between all members during conferences, hackweeks and on all interactions in online platforms including [Github](https://github.com/nextcloud) and [Forums](https://help.nextcloud.com). If you contribute, participate or interact with this community, please respect [our shared values](https://nextcloud.com/code-of-conduct/). :relieved:
-
-## :memo: Source code
-
-The Nextcloud Desktop Client is developed in Git. Since Git makes it easy to
+The ownCloud Desktop Client is developed in Git. Since Git makes it easy to
 fork and improve the source code and to adapt it to your need, many copies
 can be found on the Internet, in particular on GitHub. However, the
 authoritative repository maintained by the developers is located at
-https://github.com/nextcloud/desktop.
+https://github.com/owncloud/client.

-## :scroll: License
+## Building the source code
+
+[Building the Client](http://doc.owncloud.org/desktop/2.0/building.html)
+in the ownCloud Desktop Client manual.
+
+## Maintainers and Contributors
+
+The maintainers of this repository are:
+
+* Klaas Freitag <freitag@owncloud.com>
+* Daniel Molkentin <danimo@owncloud.com>
+* Markus Goetz <guruz@owncloud.com>
+* Olivier Goffart <ogoffart@owncloud.com>
+
+ownCloud Desktop Client is developed by the ownCloud community and receives
+patches from a variety of authors.
+
+## Reporting issues and contributing
+
+If you find any bugs or have any suggestion for improvement, please
+file an issue at https://github.com/owncloud/client/issues. Do not
+contact the authors directly by mail, as this increases the chance
+of your report being lost.
+
+If you created a patch, please submit a [Pull
+Request](https://github.com/owncloud/client/pulls). For non-trivial
+patches, we need you to sign the [Contributor
+Agreement](https://owncloud.org/contribute/agreement) before
+we can accept your patch.
+
+If you want to contact us, e.g. before starting a more complex feature,
+you can join us at
+[#owncloud-client-dev](irc://irc.freenode.net/#owncloud-client-dev).
+
+## License

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,11 +1,11 @@
 set( MIRALL_VERSION_MAJOR 2 )
-set( MIRALL_VERSION_MINOR 5 )
-set( MIRALL_VERSION_PATCH 0 )
-set( MIRALL_VERSION_YEAR  2018 )
+set( MIRALL_VERSION_MINOR 2 )
+set( MIRALL_VERSION_PATCH 4 )
+set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

 if( NOT DEFINED MIRALL_VERSION_BUILD )
--- a/admin/linux/Dockerfile
+++ b/admin/linux/Dockerfile
@@ -1,22 +0,0 @@
-# This DockerFile is used to create the image used for Jenkins, the CI system (see Jenkinsfile)
-# It is not meant to be used to create the production packages.
-
-# Distro with Qt 5.6
-FROM ubuntu:yakkety
-
-RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends \
-        locales \
-        build-essential \
-        clang \
-        ninja-build \
-        cmake \
-        extra-cmake-modules \
-        libsqlite3-dev \
-        libssl-dev \
-        libcmocka-dev \
-        qt5-default \
-        qttools5-dev-tools \
-        libqt5webkit5-dev \
-        qt5keychain-dev \
-        kio-dev \
-    && apt-get clean
--- a/admin/linux/build-appimage.sh
+++ b/admin/linux/build-appimage.sh
@@ -1,103 +0,0 @@
-#! /bin/bash
-
-set -xe
-
-mkdir /app
-mkdir /build
-
-#Set Qt-5.11
-export QT_BASE_DIR=/opt/qt511
-export QTDIR=$QT_BASE_DIR
-export PATH=$QT_BASE_DIR/bin:$PATH
-export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH
-export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
-
-#set defaults
-export SUFFIX=${DRONE_PULL_REQUEST:=master}
-if [ $SUFFIX != "master" ]; then
-    SUFFIX="PR-$SUFFIX"
-fi
-
-#QtKeyChain 0.8.0
-cd /build
-git clone https://github.com/frankosterfeld/qtkeychain.git
-cd qtkeychain
-git checkout v0.8.0
-mkdir build
-cd build
-cmake -D CMAKE_INSTALL_PREFIX=/usr ../
-make -j4
-make DESTDIR=/app install 
-
-#Build client
-cd /build
-mkdir build-client
-cd build-client
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-    -D NO_SHIBBOLETH=1 \
-    -D QTKEYCHAIN_LIBRARY=/app/usr/lib/x86_64-linux-gnu/libqt5keychain.so \
-    -D QTKEYCHAIN_INCLUDE_DIR=/app/usr/include/qt5keychain/ \
-    -DMIRALL_VERSION_SUFFIX=PR-$DRONE_PULL_REQUEST \
-    -DMIRALL_VERSION_BUILD=$DRONE_BUILD_NUMBER \
-    $DRONE_WORKSPACE
-make -j4
-make DESTDIR=/app install
-
-# Move stuff around
-cd /app
-
-mv ./usr/lib/x86_64-linux-gnu/nextcloud/* ./usr/lib/x86_64-linux-gnu/
-mv ./usr/lib/x86_64-linux-gnu/* ./usr/lib/
-rm -rf ./usr/lib/nextcloud
-rm -rf ./usr/lib/cmake
-rm -rf ./usr/include
-rm -rf ./usr/mkspecs
-rm -rf ./usr/lib/x86_64-linux-gnu/
-
-# Don't bundle nextcloudcmd as we don't run it anyway
-rm -rf ./usr/bin/nextcloudcmd
-
-# Don't bundle the explorer extentions as we can't do anything with them in the AppImage
-rm -rf ./usr/share/caja-python/
-rm -rf ./usr/share/nautilus-python/
-rm -rf ./usr/share/nemo-python/
-
-# Move sync exlucde to right location
-mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/
-rm -rf ./etc
-
-sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' usr/share/applications/nextcloud.desktop # Bug in desktop file?
-cp ./usr/share/icons/hicolor/512x512/apps/Nextcloud.png . # Workaround for linuxeployqt bug, FIXME
-
-
-# Because distros need to get their shit together
-cp -R /lib/x86_64-linux-gnu/libssl.so* ./usr/lib/
-cp -R /lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/
-cp -P /usr/local/lib/libssl.so* ./usr/lib/
-cp -P /usr/local/lib/libcrypto.so* ./usr/lib/
-
-# NSS fun
-cp -P -r /usr/lib/x86_64-linux-gnu/nss ./usr/lib/
-
-# Use linuxdeployqt to deploy
-cd /build
-wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-chmod a+x linuxdeployqt*.AppImage
-./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
-rm ./linuxdeployqt-continuous-x86_64.AppImage
-unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/app/usr/lib/
-./squashfs-root/AppRun /app/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
-
-# Set origin
-./squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/' /app/usr/lib/libnextcloudsync.so.0
-
-# Build AppImage
-./squashfs-root/AppRun /app/usr/share/applications/nextcloud.desktop -appimage
-
-mv Nextcloud*.AppImage Nextcloud-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage
-
-curl --upload-file $(readlink -f ./Nextcloud*.AppImage) https://transfer.sh/Nextcloud-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage
-
-echo
-echo "Get the AppImage at the link above!"
--- a/admin/linux/clean_tarball.sh
+++ b/admin/linux/clean_tarball.sh
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-rm -vrf admin/
-rm -vrf src/3rdparty/sqlite3   # FIXME: For CentOS6 we have to use our bundled sqlite
-rm -vrf binary/
-rm -vrf src/3rdparty/libcrashreporter-qt
-rm -vrf shell_integration/windows
-rm -vrf shell_integration/MacOSX
--- a/admin/linux/debian/README
+++ b/admin/linux/debian/README
@@ -1,31 +0,0 @@
- .pbuilderrc:
-
-  COMPONENTS="main restricted universe multiverse"
-
-  OTHERMIRROR="deb [trusted=yes] file:///${HOME}/pbuilder/deps ./"
-  HOOKDIR="${HOME}/pbuilder/hook.d"
-  BINDMOUNTS="${HOME}/pbuilder/deps"
-
-  EXTRAPACKAGES="apt-utils"
-
- pbuilder/hook.d/D70setupdeps: hook to create a Packages file for the
-  packages in pbuilder/deps
-
- pbuilder-dist trusty create --override-config --othermirror "deb [trusted=yes] file:///${HOME}/pbuilder/deps ./"
-
-  The OTHERMIRROR setting in .pbuilderrc is overridden by pbuilder-dist!
-
- scripts:
-
-  config.sh: basic configuration variables
-
-  create_debdir.sh <tag> <version> <distribution>:
-     create the Debian-conformant source directory and .orig.tar.bz2
-     in the build area
-  build.sh <tag> <version> <distribution> <debuild options...>:
-     call create_debdir.sh and then debuild
-  pbuilder.sh <distribution>:
-     build the existing source package with pbuilder-dist.
-  pbuild.sh <distribution>:
-     build the source packages with build.sh and then call
-     pbuilder.sh
--- a/admin/linux/debian/debian.bionic/changelog
+++ b/admin/linux/debian/debian.bionic/changelog
@@ -1,23 +0,0 @@
-nextcloud-client (2.3.3-1.0~bionic1) bionic; urgency=medium
-
-  * Debian build support for the forked client.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
-
-nextcloud-client (2.3.1-1.0~bionic1) bionic; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
-
-nextcloud-client (2.3.0-1.0~bionic1) bionic; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
-
-nextcloud-client (2.2.4-1.4~bionic1) bionic; urgency=medium
-
-  * The locale-specific icon names are correct too
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
--- a/admin/linux/debian/debian.bionic/control
+++ b/admin/linux/debian/debian.bionic/control
@@ -1,88 +0,0 @@
-Source: nextcloud-client
-Section: contrib/devel
-Priority: optional
-Maintainer: István Váradi <ivaradi@varadiistvan.hu>
-Build-Depends: cmake,
-               debhelper,
-               cdbs,
-               dh-python,
-               extra-cmake-modules (>= 5.16),
-               kdelibs5-dev,
-               kio-dev,
-               libcmocka-dev,
-               libhttp-dav-perl,
-               libinotify-dev [kfreebsd-any],
-               libqt5webkit5-dev,
-               libsqlite3-dev,
-               libssl-dev (>> 1.0.0),
-               zlib1g-dev,
-               optipng,
-               pkg-kde-tools,
-               python-sphinx | python3-sphinx,
-               python3-all,
-               qt5keychain-dev,
-               qtwebengine5-dev,
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               xvfb
-Standards-Version: 3.9.8
-Homepage: https://github.com/nextcloud/client_theming
-#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
-
-Package: nextcloud-client
-Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
-Description: Nextcloud desktop sync client
- Use the desktop client to keep your files synchronized
- between your Nextcloud server and your desktop. Select
- one or more directories on your local machine and always
- have access to your latest files wherever you are.
-
-Package: libnextcloudsync0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nextcloud sync library
- Used by the Nextcloud desktop client as the synchronization engine.
-
-Package: libnextcloudsync-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
-Description: Nextcloud sync library development files
- The headers and development library for the Nextcloud sync library.
-
-Package: nextcloud-client-l10n
-Architecture: all
-Depends: ${misc:Depends}
-Description: Nextcloud client internatialization files
- The translation files.
-
-Package: nextcloud-client-nautilus
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
-Description: Nautilus plugin for Nextcloud
- This package contains a Nautilus plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-nemo
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
-Description: Nemo plugin for Nextcloud
- This package contains a Nemo plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-caja
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
-Description: Caja plugin for Nextcloud
- This package contains a Caja plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-dolphin
-Architecture: any
-Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
-Description: Dolphin plugin for Nextcloud
- This package contains a Dolphin plugin to display
- synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian.cosmic/changelog
+++ b/admin/linux/debian/debian.cosmic/changelog
@@ -1,23 +0,0 @@
-nextcloud-client (2.3.3-1.0~cosmic1) cosmic; urgency=medium
-
-  * Debian build support for the forked client.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
-
-nextcloud-client (2.3.1-1.0~cosmic1) cosmic; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
-
-nextcloud-client (2.3.0-1.0~cosmic1) cosmic; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
-
-nextcloud-client (2.2.4-1.4~cosmic1) cosmic; urgency=medium
-
-  * The locale-specific icon names are correct too
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
--- a/admin/linux/debian/debian.cosmic/control
+++ b/admin/linux/debian/debian.cosmic/control
@@ -1,88 +0,0 @@
-Source: nextcloud-client
-Section: contrib/devel
-Priority: optional
-Maintainer: István Váradi <ivaradi@varadiistvan.hu>
-Build-Depends: cmake,
-               debhelper,
-               cdbs,
-               dh-python,
-               extra-cmake-modules (>= 5.16),
-               kdelibs5-dev,
-               kio-dev,
-               libcmocka-dev,
-               libhttp-dav-perl,
-               libinotify-dev [kfreebsd-any],
-               libqt5webkit5-dev,
-               libsqlite3-dev,
-               libssl-dev (>> 1.0.0),
-               zlib1g-dev,
-               optipng,
-               pkg-kde-tools,
-               python-sphinx | python3-sphinx,
-               python3-all,
-               qt5keychain-dev,
-               qtwebengine5-dev,
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               xvfb
-Standards-Version: 3.9.8
-Homepage: https://github.com/nextcloud/client_theming
-#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
-
-Package: nextcloud-client
-Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
-Description: Nextcloud desktop sync client
- Use the desktop client to keep your files synchronized
- between your Nextcloud server and your desktop. Select
- one or more directories on your local machine and always
- have access to your latest files wherever you are.
-
-Package: libnextcloudsync0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nextcloud sync library
- Used by the Nextcloud desktop client as the synchronization engine.
-
-Package: libnextcloudsync-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
-Description: Nextcloud sync library development files
- The headers and development library for the Nextcloud sync library.
-
-Package: nextcloud-client-l10n
-Architecture: all
-Depends: ${misc:Depends}
-Description: Nextcloud client internatialization files
- The translation files.
-
-Package: nextcloud-client-nautilus
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
-Description: Nautilus plugin for Nextcloud
- This package contains a Nautilus plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-nemo
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
-Description: Nemo plugin for Nextcloud
- This package contains a Nemo plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-caja
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
-Description: Caja plugin for Nextcloud
- This package contains a Caja plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-dolphin
-Architecture: any
-Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
-Description: Dolphin plugin for Nextcloud
- This package contains a Dolphin plugin to display
- synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian.stable/changelog
+++ b/admin/linux/debian/debian.stable/changelog
@@ -1,48 +0,0 @@
-nextcloud-client (2.3.3-1.0~stable1) stable; urgency=medium
-
-  * Debian build support for the forked client.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
-
-nextcloud-client (2.3.1-1.0) stable; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
-
-nextcloud-client (2.3.0-1.0) stable; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
-
-nextcloud-client (2.2.4-1.4) stable; urgency=medium
-
-  * The locale-specific icon names are correct too
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
-
-nextcloud-client (2.2.4-1.3) stable; urgency=medium
-
-  * Caja syncstate plugin is built.
-  * The syncstate plugin has application-specific name
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 27 Jan 2017 19:34:18 +0100
-
-nextcloud-client (2.2.4-1.2) stable; urgency=medium
-
-  * Fixed appname in the Nemo syncstate extension.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
-
-nextcloud-client (2.2.4-1.1) stable; urgency=medium
-
-  * Added Nautilus and Nemo syncstate extensions.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
-
-nextcloud-client (2.2.4-1.0) stable; urgency=medium
-
-  * Initial release.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100
--- a/admin/linux/debian/debian.stable/control
+++ b/admin/linux/debian/debian.stable/control
@@ -1,82 +0,0 @@
-Source: nextcloud-client
-Section: contrib/devel
-Priority: optional
-Maintainer: István Váradi <ivaradi@varadiistvan.hu>
-Build-Depends: cmake,
-               debhelper,
-               cdbs,
-               dh-python,
-               extra-cmake-modules (>= 5.16),
-               kdelibs5-dev,
-               kio-dev,
-               libcmocka-dev,
-               libhttp-dav-perl,
-               libinotify-dev [kfreebsd-any],
-               libqt5webkit5-dev,
-               libsqlite3-dev,
-               libssl-dev (>> 1.0.0),
-               zlib1g-dev,
-               optipng,
-               pkg-kde-tools,
-               python-sphinx | python3-sphinx,
-               python3-all,
-               qt5keychain-dev,
-               qtwebengine5-dev,
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               xvfb
-Standards-Version: 3.9.8
-Homepage: https://github.com/nextcloud/client_theming
-#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
-
-Package: nextcloud-client
-Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
-Recommends: libgnome-keyring0
-Description: Nextcloud desktop sync client
- Use the desktop client to keep your files synchronized
- between your Nextcloud server and your desktop. Select
- one or more directories on your local machine and always
- have access to your latest files wherever you are.
-
-Package: libnextcloudsync0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nextcloud sync library
- Used by the Nextcloud desktop client as the synchronization engine.
-
-Package: libnextcloudsync-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
-Description: Nextcloud sync library development files
- The headers and development library for the Nextcloud sync library.
-
-Package: nextcloud-client-l10n
-Architecture: all
-Depends: ${misc:Depends}
-Description: Nextcloud client internatialization files
- The translation files.
-
-Package: nextcloud-client-nautilus
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
-Description: Nautilus plugin for Nextcloud
- This package contains a Nautilus plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-nemo
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo, nemo, ${misc:Depends}
-Description: Nemo plugin for Nextcloud
- This package contains a Nemo plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-caja
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
-Description: Caja plugin for Nextcloud
- This package contains a Caja plugin to display
- synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch
+++ b/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch
@@ -1,24 +0,0 @@
-Binary files nextcloud-client-2.4.0.orig/.git/index and nextcloud-client-2.4.0/.git/index differ
-diff -ruN nextcloud-client-2.4.0.orig/src/CMakeLists.txt nextcloud-client-2.4.0/src/CMakeLists.txt
--- nextcloud-client-2.4.0.orig/src/CMakeLists.txt	2018-02-01 19:16:38.461162563 +0100
-+++ nextcloud-client-2.4.0/src/CMakeLists.txt	2018-02-01 19:20:20.253824030 +0100
-@@ -4,7 +4,7 @@
- 
- set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
- 
-find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
-+find_package(Qt5 5.5 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
- if (Qt5Core_VERSION VERSION_LESS 5.9.0)
- message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
- endif()
--- nextcloud-client-2.4.0.orig/admin/osx/CMakeLists.txt	2018-05-22 07:01:48.248646951 +0200
-+++ nextcloud-client-2.4.0/admin/osx/CMakeLists.txt	2018-05-22 07:01:51.012689711 +0200
-@@ -11,7 +11,7 @@
-   set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
- endif()
- 
-find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
-+find_package(Qt5 5.5 COMPONENTS Core REQUIRED)
- configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
- configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
- configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
--- a/admin/linux/debian/debian/101-sync-inotify.conf
+++ b/admin/linux/debian/debian/101-sync-inotify.conf
@@ -1 +0,0 @@
-fs.inotify.max_user_watches = 524288
--- a/admin/linux/debian/debian/changelog
+++ b/admin/linux/debian/debian/changelog
@@ -1,48 +0,0 @@
-nextcloud-client (2.3.3-1.0~xenial1) xenial; urgency=medium
-
-  * Debian build support for the forked client.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
-
-nextcloud-client (2.3.1-1.0~xenial1) xenial; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
-
-nextcloud-client (2.3.0-1.0~xenial1) xenial; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
-
-nextcloud-client (2.2.4-1.4~xenial1) xenial; urgency=medium
-
-  * The locale-specific icon names are correct too
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
-
-nextcloud-client (2.2.4-1.3~xenial1) xenial; urgency=medium
-
-  * Caja syncstate plugin is built.
-  * The syncstate plugin has application-specific name
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 27 Jan 2017 19:34:18 +0100
-
-nextcloud-client (2.2.4-1.2~xenial1) xenial; urgency=medium
-
-  * Fixed appname in the Nemo syncstate extension.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
-
-nextcloud-client (2.2.4-1.1~xenial1) xenial; urgency=medium
-
-  * Added Nautilus and Nemo syncstate extensions.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
-
-nextcloud-client (2.2.4-1.0~xenial1) xenial; urgency=medium
-
-  * Initial release.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100
--- a/admin/linux/debian/debian/compat
+++ b/admin/linux/debian/debian/compat
@@ -1 +0,0 @@
-9
--- a/admin/linux/debian/debian/control
+++ b/admin/linux/debian/debian/control
@@ -1,89 +0,0 @@
-Source: nextcloud-client
-Section: contrib/devel
-Priority: optional
-Maintainer: István Váradi <ivaradi@varadiistvan.hu>
-Build-Depends: cmake,
-               debhelper,
-               cdbs,
-               dh-python,
-               extra-cmake-modules (>= 5.16),
-               kdelibs5-dev,
-               kio-dev,
-               libcmocka-dev,
-               libhttp-dav-perl,
-               libinotify-dev [kfreebsd-any],
-               libqt5webkit5-dev,
-               libsqlite3-dev,
-               libssl-dev (>> 1.0.0),
-               zlib1g-dev,
-               optipng,
-               pkg-kde-tools,
-               python-sphinx | python3-sphinx,
-               python3-all,
-               qt5keychain-dev,
-               qtwebengine5-dev,
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               xvfb
-Standards-Version: 3.9.8
-Homepage: https://github.com/nextcloud/client_theming
-#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
-
-Package: nextcloud-client
-Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
-Recommends: libgnome-keyring0
-Description: Nextcloud desktop sync client
- Use the desktop client to keep your files synchronized
- between your Nextcloud server and your desktop. Select
- one or more directories on your local machine and always
- have access to your latest files wherever you are.
-
-Package: libnextcloudsync0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nextcloud sync library
- Used by the Nextcloud desktop client as the synchronization engine.
-
-Package: libnextcloudsync-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
-Description: Nextcloud sync library development files
- The headers and development library for the Nextcloud sync library.
-
-Package: nextcloud-client-l10n
-Architecture: all
-Depends: ${misc:Depends}
-Description: Nextcloud client internatialization files
- The translation files.
-
-Package: nextcloud-client-nautilus
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
-Description: Nautilus plugin for Nextcloud
- This package contains a Nautilus plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-nemo
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
-Description: Nemo plugin for Nextcloud
- This package contains a Nemo plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-caja
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
-Description: Caja plugin for Nextcloud
- This package contains a Caja plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-dolphin
-Architecture: any
-Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
-Description: Dolphin plugin for Nextcloud
- This package contains a Dolphin plugin to display
- synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian/copyright
+++ b/admin/linux/debian/debian/copyright
@@ -1,3 +0,0 @@
-Files: *
-Copyright: 2012-2015 ownCloud, inc.; Nuernberg, Germany., 2016 Nextcloud GmbH
-License: GPL-2+
--- a/admin/linux/debian/debian/libnextcloudsync-dev.install
+++ b/admin/linux/debian/debian/libnextcloudsync-dev.install
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*/libnextcloudsync.so
-usr/lib/*/nextcloud/libocsync.so
--- a/admin/linux/debian/debian/libnextcloudsync0.install
+++ b/admin/linux/debian/debian/libnextcloudsync0.install
@@ -1,3 +0,0 @@
-etc
-usr/lib/*/libnextcloudsync.so.?*
-usr/lib/*/nextcloud/libocsync.so.?*
--- a/admin/linux/debian/debian/nextcloud-client-caja.install
+++ b/admin/linux/debian/debian/nextcloud-client-caja.install
@@ -1 +0,0 @@
-usr/share/caja-python
--- a/admin/linux/debian/debian/nextcloud-client-dolphin.install
+++ b/admin/linux/debian/debian/nextcloud-client-dolphin.install
@@ -1,4 +0,0 @@
-usr/lib/*/libnextclouddolphinpluginhelper.so
-usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
-usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
-usr/share/kservices5/nextclouddolphinactionplugin.desktop
--- a/admin/linux/debian/debian/nextcloud-client-dolphin.lintian-overrides
+++ b/admin/linux/debian/debian/nextcloud-client-dolphin.lintian-overrides
@@ -1,2 +0,0 @@
-nextcloud-client-dolphin: package-name-doesnt-match-sonames
-nextcloud-client-dolphin: shlib-without-versioned-soname
--- a/admin/linux/debian/debian/nextcloud-client-dolphin.triggers
+++ b/admin/linux/debian/debian/nextcloud-client-dolphin.triggers
@@ -1 +0,0 @@
-activate-noawait ldconfig
--- a/admin/linux/debian/debian/nextcloud-client-l10n.install
+++ b/admin/linux/debian/debian/nextcloud-client-l10n.install
@@ -1 +0,0 @@
-usr/share/nextcloud/i18n
--- a/admin/linux/debian/debian/nextcloud-client-nautilus.install
+++ b/admin/linux/debian/debian/nextcloud-client-nautilus.install
@@ -1 +0,0 @@
-usr/share/nautilus-python
--- a/admin/linux/debian/debian/nextcloud-client-nemo.install
+++ b/admin/linux/debian/debian/nextcloud-client-nemo.install
@@ -1 +0,0 @@
-usr/share/nemo-python
--- a/admin/linux/debian/debian/nextcloud-client.install
+++ b/admin/linux/debian/debian/nextcloud-client.install
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/applications
-usr/share/icons
-debian/101-sync-inotify.conf etc/sysctl.d
--- a/admin/linux/debian/debian/nextcloud-client.lintian-overrides
+++ b/admin/linux/debian/debian/nextcloud-client.lintian-overrides
@@ -1,3 +0,0 @@
-nextcloud-client: binary-or-shlib-defines-rpath
-nextcloud-client: binary-without-manpage
-nextcloud-client: license-problem-convert-utf-code
--- a/admin/linux/debian/debian/rules
+++ b/admin/linux/debian/debian/rules
@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-
-DEB_SHLIBDEPS_INCLUDE=$(CURDIR)/$(DEB_BUILDDIR)/csync/src
-
-DEB_SRCDIR=.
-DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_SKIP_RPATH=OFF -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
--- a/admin/linux/debian/debian/source/format
+++ b/admin/linux/debian/debian/source/format
@@ -1 +0,0 @@
-3.0 (quilt)
--- a/admin/linux/debian/debian/source/lintian-overrides
+++ b/admin/linux/debian/debian/source/lintian-overrides
@@ -1,9 +0,0 @@
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/bootstrap.js line length is 22206 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/jquery.js
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/jquery.js line length is 32412 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_com/static/bootstrap.js line length is 22206 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_com/static/jquery.js line length is 32412 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_release/static/bootstrap.js line length is 22206 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_release/static/jquery.js line length is 32412 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_org/static/js/jquery-1.11.0.min.js
-nextcloud-client source: license-problem-convert-utf-code
--- a/admin/linux/debian/drone-build.sh
+++ b/admin/linux/debian/drone-build.sh
@@ -1,124 +0,0 @@
-#!/bin/bash
-
-set -xe
-shopt -s extglob
-
-PPA=ppa:nextcloud-devs/client-beta
-PPA_BETA=ppa:nextcloud-devs/client-alpha
-
-OBS_PROJECT=home:ivaradi:beta
-OBS_PROJECT_BETA=home:ivaradi:alpha
-OBS_PACKAGE=nextcloud-client
-
-pull_request=${DRONE_PULL_REQUEST:=master}
-
-if test -z "${DRONE_WORKSPACE}"; then
-    DRONE_WORKSPACE=`pwd`
-fi
-
-if test -z "${DRONE_DIR}"; then
-    DRONE_DIR=`dirname ${DRONE_WORKSPACE}`
-fi
-
-set +x
-if test "$DEBIAN_SECRET_KEY" -a "$DEBIAN_SECRET_IV"; then
-    openssl aes-256-cbc -K $DEBIAN_SECRET_KEY -iv $DEBIAN_SECRET_IV -in admin/linux/debian/signing-key.txt.enc -d | gpg --import
-
-    openssl aes-256-cbc -K $DEBIAN_SECRET_KEY -iv $DEBIAN_SECRET_IV -in admin/linux/debian/oscrc.enc -out ~/.oscrc -d
-
-    touch ~/.has_ppa_keys
-fi
-set -x
-
-cd "${DRONE_WORKSPACE}"
-read basever kind <<<$(admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog stable)
-
-cd "${DRONE_DIR}"
-
-echo "$kind" > kind
-kind="release"
-
-if test "$kind" = "beta"; then
-    repo=nextcloud-devs/client-alpha
-else
-    repo=nextcloud-devs/client-beta
-fi
-
-origsourceopt=""
-
-if ! wget http://ppa.launchpad.net/${repo}/ubuntu/pool/main/n/nextcloud-client/nextcloud-client_${basever}.orig.tar.bz2; then
-    cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
-    tar cjf nextcloud-client_${basever}.orig.tar.bz2 --exclude .git nextcloud-client_${basever}
-    origsourceopt="-sa"
-fi
-
-for distribution in xenial bionic cosmic stable; do
-    rm -rf nextcloud-client_${basever}
-    cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
-
-    cd nextcloud-client_${basever}
-
-    cp -a admin/linux/debian/debian .
-    if test -d admin/linux/debian/debian.${distribution}; then
-        tar cf - -C admin/linux/debian/debian.${distribution} . | tar xf - -C debian
-    fi
-
-    admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution}
-    cp /tmp/tmpchangelog debian/changelog
-    if test -f admin/linux/debian/debian.${distribution}/changelog; then
-        cat admin/linux/debian/debian.${distribution}/changelog >> debian/changelog
-    else
-        cat admin/linux/debian/debian/changelog >> debian/changelog
-    fi
-
-    for p in debian/post-patches/*.patch; do
-        if test -f "${p}"; then
-            echo "Applying ${p}"
-            patch -p1 < "${p}"
-        fi
-    done
-
-    fullver=`head -1 debian/changelog | sed "s:nextcloud-client (\([^)]*\)).*:\1:"`
-
-    EDITOR=true dpkg-source --commit . local-changes
-
-    dpkg-source --build .
-    dpkg-genchanges -S ${origsourceopt} > "../nextcloud-client_${fullver}_source.changes"
-
-    if test -f ~/.has_ppa_keys; then
-        debsign -k7D14AA7B -S
-    fi
-
-    cd ..
-done
-
-if test "${pull_request}" = "master"; then
-    kind=`cat kind`
-
-    if test "$kind" = "beta"; then
-        PPA=$PPA_BETA
-        OBS_PROJECT=$OBS_PROJECT_BETA
-    fi
-    OBS_SUBDIR="${OBS_PROJECT}/${OBS_PACKAGE}"
-
-    if test -f ~/.has_ppa_keys; then
-        for changes in nextcloud-client_*~+([a-z])1_source.changes; do
-            dput $PPA $changes > /dev/null
-        done
-
-        mkdir osc
-        cd osc
-        osc co ${OBS_PROJECT} ${OBS_PACKAGE}
-        if test "$(ls ${OBS_SUBDIR})"; then
-            osc delete ${OBS_SUBDIR}/*
-        fi
-        cp ../nextcloud-client*.orig.tar.* ${OBS_SUBDIR}/
-        cp ../nextcloud-client_*[0-9.][0-9].dsc ${OBS_SUBDIR}/
-        cp ../nextcloud-client_*[0-9.][0-9].debian.tar* ${OBS_SUBDIR}/
-        cp ../nextcloud-client_*[0-9.][0-9]_source.changes ${OBS_SUBDIR}/
-        osc add ${OBS_SUBDIR}/*
-
-        cd ${OBS_SUBDIR}
-        osc commit -m "Travis update"
-    fi
-fi
--- a/admin/linux/debian/oscrc.enc
+++ b/admin/linux/debian/oscrc.enc
--- a/admin/linux/debian/scripts/addchange.sh
+++ b/admin/linux/debian/scripts/addchange.sh
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-scriptdir=`dirname $0`
-
-DEFAULT_DIST=yakkety
-
-package="nextcloud-client"
-version="$1"
-comment="$2"
-distver="${3:-}"
-
-if test -z "${distver}"; then
-    distver="1"
-fi
-
-packagedir="${scriptdir}/../${package}"
-
-now=`date -R`
-
-tmpfile="/tmp/addchange.$$"
-
-for subdir in "${packagedir}/debian"*; do
-    if test -f "${subdir}/changelog"; then
-        echo "${subdir}"
-        bname=`basename "${subdir}"`
-        dist=`echo "${bname}" | sed 's:debian\.\?::'`
-        if test -z "${dist}"; then
-            dist="${DEFAULT_DIST}"
-        fi
-        if test "${dist}" = "stable"; then
-            versuffix=""
-        else
-            versuffix="~${dist}${distver}"
-        fi
-        cat > "${tmpfile}" <<EOF
-${package} (${version}${versuffix}) ${dist}; urgency=medium
-
-  * ${comment}
-
- -- István Váradi <ivaradi@varadiistvan.hu>  ${now}
-
-EOF
-        cat "${subdir}/changelog" >> "${tmpfile}"
-        mv "${tmpfile}" "${subdir}/changelog"
-    fi
-done
-
-rm -f "${tmpfile}"
--- a/admin/linux/debian/scripts/config.sh
+++ b/admin/linux/debian/scripts/config.sh
@@ -1,26 +0,0 @@
-# The directory where the sources are found
-SOURCES="${HOME}/sources/nextcloud/client"
-
-# The directory into which the packages should be genereated
-BUILDAREA="${SOURCES}/build-area"
-
-# The directory containing the Git repositories
-GITROOTS="${SOURCES}/git"
-
-# The pbuilder root directory
-PBUILDER_ROOT="${HOME}/pbuilder"
-
-# The dependencies directory for pbuilder
-PBUILDER_DEPS="${PBUILDER_ROOT}/deps"
-
-# The version of the nextcloud-client package
-NEXTCLOUD_CLIENT_VERSION=2.4.0
-
-# The FULL version of the nextcloud-client package
-NEXTCLOUD_CLIENT_FULL_VERSION="${NEXTCLOUD_CLIENT_VERSION}-1.0~@DISTRIBUTION@1"
-
-# The tag of the nextcloud-client package
-NEXTCLOUD_CLIENT_TAG="v${NEXTCLOUD_CLIENT_VERSION}"
-
-# The number of CPUs that can be used for paralel builds
-NUMCPUS=4
--- a/admin/linux/debian/scripts/create_debdir.sh
+++ b/admin/linux/debian/scripts/create_debdir.sh
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-scriptdir=`dirname $0`
-scriptdir=`cd "${scriptdir}" && pwd`
-
-. "${scriptdir}/config.sh"
-
-package="nextcloud-client"
-tag="${1}"
-version="${2}"
-distribution="${3}"
-
-gitdir="${GITROOTS}/client"
-packagedir="${BUILDAREA}/${package}_${version}"
-origtarname="${package}_${version}.orig.tar.bz2"
-origtar="${BUILDAREA}/${origtarname}"
-
-archive_submodules()
-{
-    local subdir="${1}"
-    local treeish="${2}"
-
-    local dir="${gitdir}"
-    local destdir="${packagedir}"
-    if test "${subdir}"; then
-        echo "  copying submodule ${subdir}"
-        dir="${dir}/${subdir}"
-        destdir="${destdir}/${subdir}"
-    fi
-
-    mkdir -p "${destdir}"
-
-    (cd "${dir}"; git archive "${treeish}" | tar xf - -C "${destdir}")
-
-    (cd "${dir}"; git ls-tree "${treeish}" -r) | while read mode type object file; do
-        if test "${type}" = "commit"; then
-            sdir="${file}"
-            if test "${subdir}"; then
-                sdir="${subdir}/${sdir}"
-            fi
-            archive_submodules "${sdir}" "${object}"
-        fi
-    done
-}
-
-rm -rf "${packagedir}"
-mkdir -p "${packagedir}"
-
-echo "Updating submodules"
-commit=`cd "${gitdir}"; git rev-parse HEAD`
-(cd "${gitdir}"; git checkout "${tag}"; git submodule update --recursive --init)
-
-echo "Copying sources"
-archive_submodules "" "${tag}"
-
-if test -f "${GITROOTS}/${origtarname}"; then
-    echo "Copying orig archive from ${GITROOTS}"
-    cp -a "${GITROOTS}/${origtarname}" "${BUILDAREA}"
-else
-    echo "Creating orig archive"
-    tar cjf "${origtar}" -C "${BUILDAREA}" "${package}_${version}"
-fi
-
-echo "Restoring Git state"
-(cd "${gitdir}"; git checkout "${commit}")
-cd "${scriptdir}"
-
-echo "Copying Debian files"
-mkdir -p "${packagedir}/debian"
-tar cf - -C "${scriptdir}/../debian" . | tar xf - -C "${packagedir}/debian"
-
-if test -d "${scriptdir}/../debian.${distribution}"; then
-    tar cf - -C "${scriptdir}/../debian.${distribution}" . | tar xf - -C "${packagedir}/debian"
-fi
-
-pushd "${packagedir}"
-for p in debian/post-patches/*.patch; do
-    if test -f "${p}"; then
-        echo "Applying ${p}"
-        patch -p1 < "${p}"
-    fi
-done
-popd
-
-"${scriptdir}/git2changelog.py"  /tmp/git2changelog "${distribution}"
-mv "${packagedir}/debian/changelog" "${packagedir}/debian/changelog.old"
-cat /tmp/git2changelog "${packagedir}/debian/changelog.old" > "${packagedir}/debian/changelog"
--- a/admin/linux/debian/scripts/git2changelog.cfg
+++ b/admin/linux/debian/scripts/git2changelog.cfg
@@ -1,8 +0,0 @@
-# Use the configuration below with appropriate changes,
-# if you want to support a new client version using
-# your own fork. In such a case the tags do not come
-# accross to the main repo for a pull request, so
-# some hacking is needed
-[versionhack]
-commit = bc7e65b39552ac458b2adacf76cbf98735ec29a0
-tag = v2.4.0-beta
--- a/admin/linux/debian/scripts/git2changelog.py
+++ b/admin/linux/debian/scripts/git2changelog.py
@@ -1,140 +0,0 @@
-#!//usr/bin/env python2.7
-
-import subprocess
-import re
-import sys
-import datetime
-import os
-import ConfigParser
-
-distribution="yakkety"
-
-versionTagRE = re.compile("^v([0-9]+((\.[0-9]+)+))(-(.+))?$")
-
-def processVersionTag(tag):
-    m = versionTagRE.match(tag)
-    if m:
-        return (m.group(1), "release" if m.group(4) is None else "beta")
-    else:
-        return None
-
-def getCommitVersion(commit):
-    major=None
-    minor=None
-    patch=None
-    for line in subprocess.check_output(["git", "show",
-                                         commit + ":VERSION.cmake"]).splitlines():
-        m = re.match("set\( MIRALL_VERSION_([A-Z]+) +([0-9])+ *\)", line)
-        if m is not None:
-            kind=m.group(1)
-            version=m.group(2)
-            if kind=="MAJOR":
-                major=version
-            elif kind=="MINOR":
-                minor=version
-            elif kind=="PATCH":
-                patch=version
-    if major and minor and patch:
-        return major + "." + minor + "." + patch
-    else:
-        return None
-
-def collectEntries(baseCommit, baseVersion, kind):
-    scriptdir = os.path.dirname(__file__)
-    configPath = os.path.join(scriptdir, "git2changelog.cfg")
-
-    newVersionCommit = None
-    newVersionTag = None
-    newVersionOrigTag = None
-
-    if os.path.exists(configPath):
-        config = ConfigParser.SafeConfigParser()
-        config.read(configPath)
-        if config.has_section("versionhack"):
-            if config.has_option("versionhack", "commit") and \
-               config.has_option("versionhack", "tag"):
-                newVersionCommit = config.get("versionhack", "commit")
-                newVersionTag = config.get("versionhack", "tag")
-
-    entries = []
-
-    args = ["git", "log",
-            "--format=%h%x09%an%x09%ae%x09%aD%x09%ad%x09%s",
-            "--date=unix", "--author-date-order", "--reverse"]
-    try:
-        output = subprocess.check_output(args + [baseCommit + ".."])
-    except:
-        output = subprocess.check_output(args)
-
-
-    lastVersionTag = None
-    lastCMAKEVersion = None
-    for line in output.splitlines():
-        (commit, name, email, date, revdate, subject) = line.split("\t")
-        revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S")
-
-        if commit==newVersionCommit:
-            result = processVersionTag(newVersionTag)
-            if result:
-                newVersionOrigTag = lastVersionTag
-                (baseVersion, kind) = result
-
-
-        version=getCommitVersion(commit)
-        if version and version!=lastCMAKEVersion:
-            tag = "v" + version
-            if tag!=newVersionOrigTag:
-                result = processVersionTag(tag)
-                if result:
-                    lastVersionTag = tag
-                    lastCMAKEVersion = version
-                    (baseVersion, kind) = result
-
-        for tag in subprocess.check_output(["git", "tag",
-                                            "--points-at",
-                                            commit]).splitlines():
-            if tag!=newVersionOrigTag:
-                result = processVersionTag(tag)
-                if result:
-                    lastVersionTag = tag
-                    (baseVersion, kind) = result
-
-
-        entries.append((commit, name, email, date, revdate, subject,
-                        baseVersion, kind))
-
-    entries.reverse()
-
-    return entries
-
-def genChangeLogEntries(f, entries, distribution):
-    latestBaseVersion = None
-    latestKind = None
-    for (commit, name, email, date, revdate, subject, baseVersion, kind) in entries:
-        if latestBaseVersion is None:
-            latestBaseVersion = baseVersion
-            latestKind = kind
-        upstreamVersion = baseVersion + "-" + revdate
-        if distribution=="stable":
-            version = upstreamVersion
-        else:
-            version = upstreamVersion + "~" + distribution + "1"
-        print >> f, "nextcloud-client (%s) %s; urgency=medium" % (version, distribution)
-        print >> f
-        print >> f, "  * " + subject
-        print >> f
-        print >> f, " -- %s <%s>  %s" % (name, email, date)
-        print >> f
-    return (latestBaseVersion, latestKind)
-
-if __name__ == "__main__":
-
-    distribution = sys.argv[2]
-
-    #entries = collectEntries("8aade24147b5313f8241a8b42331442b7f40eef9", "2.2.4", "release")
-    entries = collectEntries("f9b1c724d6ab5431e0cd56b7cd834f2dd48cebb1", "2.4.0", "release")
-
-
-    with open(sys.argv[1], "wt") as f:
-        (baseVersion, kind) = genChangeLogEntries(f, entries, distribution)
-        print baseVersion, kind
--- a/admin/linux/debian/scripts/pbuild.sh
+++ b/admin/linux/debian/scripts/pbuild.sh
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-scriptdir=`dirname $0`
-scriptdir=`cd "${scriptdir}" && pwd`
-
-. "${scriptdir}/config.sh"
-
-distribution="${1}"
-shift
-
-pushd /
-"${scriptdir}/build.sh" "${distribution}" -S "$@"
-
-"${scriptdir}/pbuilder.sh" "${distribution}" "$@"
-popd
--- a/admin/linux/debian/scripts/pbuilder.sh
+++ b/admin/linux/debian/scripts/pbuilder.sh
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-scriptdir=`dirname $0`
-
-. "${scriptdir}/config.sh"
-
-distribution="${1}"
-shift
-
-resultdir="${PBUILDER_ROOT}/${distribution}_result"
-
-rm -f "${PBUILDER_DEPS}/"*.deb
-echo -n > "${PBUILDER_DEPS}/Packages"
-rm -f "${resultdir}/"*
-
-source "${HOME}/.pbuilderrc"
-
-dscversion=`echo ${NEXTCLOUD_CLIENT_FULL_VERSION} | sed "s:@DISTRIBUTION@:${distribution}:g"`
-pbuilder-dist "${distribution}" build --othermirror "${OTHERMIRROR}" --debbuildopts "-j${NUMCPUS}" "$@" "${BUILDAREA}/nextcloud-client_${dscversion}.dsc"
--- a/admin/linux/debian/signing-key.txt.enc
+++ b/admin/linux/debian/signing-key.txt.enc
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -1,6 +1,6 @@

 # Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
-# from the OEM.cmake for branded clients or from NEXTCLOUD.cmake for the non
+# from the OEM.cmake for branded clients or from OWNCLOUD.cmake for the non
 # branded client.
 # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
 # includes CMAKE_SOURCE_DIR or so.
@@ -11,10 +11,7 @@ else()
  set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()

-find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
-configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
-configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
+configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
+configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
 configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh)
-configure_file(fuse/FUSE\ for\ macOS\ 3.8.1.pkg ${CMAKE_CURRENT_BINARY_DIR}/fuse/FUSE\ for\ macOS\ 3.8.1.pkg COPYONLY)
-configure_file(fuse/settings.plist ${CMAKE_CURRENT_BINARY_DIR}/fuse/settings.plist  COPYONLY)
--- a/admin/osx/create_mac_pkg.sh.cmake
+++ b/admin/osx/create_mac_pkg.sh.cmake
@@ -23,7 +23,7 @@ identity="$3"
 prjfile=$build_path/admin/osx/macosx.pkgproj

 # The name of the installer package
-installer="@APPLICATION_SHORTNAME@-qt@Qt5Core_VERSION@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
+installer="@APPLICATION_SHORTNAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
 installer_file="$installer.pkg"
 installer_file_tar="$installer.pkg.tar"
 installer_file_tar_bz2="$installer.pkg.tar.bz2"
--- a/admin/osx/fuse/FUSE
+++ b/admin/osx/fuse/FUSE
--- a/admin/osx/fuse/Uninstaller.app/Contents/Info.plist
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Info.plist
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleAllowMixedLocalizations</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDisplayName</key>
-	<string>Uninstaller</string>
-	<key>CFBundleExecutable</key>
-	<string>applet</string>
-	<key>CFBundleIconFile</key>
-	<string>Uninstaller</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Uninstaller</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>aplt</string>
-	<key>LSMinimumSystemVersionByArchitecture</key>
-	<dict>
-		<key>x86_64</key>
-		<string>10.6</string>
-	</dict>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>LSUIElement</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © Benjamin Fleischer. All rights reserved.</string>
-</dict>
-</plist>
--- a/admin/osx/fuse/Uninstaller.app/Contents/MacOS/applet
+++ b/admin/osx/fuse/Uninstaller.app/Contents/MacOS/applet
--- a/admin/osx/fuse/Uninstaller.app/Contents/PkgInfo
+++ b/admin/osx/fuse/Uninstaller.app/Contents/PkgInfo
@@ -1 +0,0 @@
-APPLaplt
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/English.lproj/Localizable.strings
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/English.lproj/Localizable.strings
@@ -1,10 +0,0 @@
-"welcome_text" = "Remove FUSE for macOS?";
-"welcome_message" = "In case FUSE for macOS was installed using a package manager (e.g. Homebrew, MacPorts), please follow the instructions provided by the package manager for removing FUSE for macOS.\n\nIt is recommended to restart the Mac once the uninstallation is complete. Would you like to continue?";
-"welcome_no" = "No";
-"welcome_yes" = "Yes";
-
-"uninstaller_successful_text" = "Uninstallation successful";
-"uninstaller_successful_message" = "FUSE for macOS has been sucessfully removed.";
-
-"uninstaller_failed_text" = "Uninstallation failed";
-"uninstaller_failed_message" = "FUSE for macOS could not be removed due to an unknown error.";
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/German.lproj/Localizable.strings
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/German.lproj/Localizable.strings
@@ -1,10 +0,0 @@
-"welcome_text" = "FUSE for macOS entfernen?";
-"welcome_message" = "Falls FUSE for macOS mit Hilfe eines Paket Managers (z.B. Homebrew, MacPorts) installiert wurde, folgen Sie bitte den Anweisungen des Paket Managers, um FUSE for macOS zu entfernen.\n\nEs wird empfohlen den Mac nach Abschluss der Deinstallation neu zu starten. Möchten Sie fortfahren?";
-"welcome_no" = "Nein";
-"welcome_yes" = "Ja";
-
-"uninstaller_successful_text" = "Deinstallation erfolgreich";
-"uninstaller_successful_message" = "FUSE for macOS wurde erfolgreich entfernt.";
-
-"uninstaller_failed_text" = "Deinstallation fehlgeschlagen";
-"uninstaller_failed_message" = "Bei der Deinstallation von FUSE for macOS ist ein unbekannter Fehler aufgetreten.";
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/array.sh
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/array.sh
@@ -1,247 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011-2014 Benjamin Fleischer
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# Requires common.sh
-# Requires math.sh
-# Requires string.sh
-
-
-function array_is_array
-{
-    if common_is_variable "${1}"
-    then
-        [[ "`declare -p "${1}" 2> /dev/null`" =~ ^"declare -"[^=]{0,}"a"[^=]{0,}" ${1}=" ]]
-    else
-        return 1
-    fi
-}
-
-function array_create
-{
-    common_assert "common_variable_is_legal_name `string_escape "${1}"`"
-
-    eval "${1}=()"
-}
-
-function array_size
-{
-    common_assert "array_is_array `string_escape "${1}"`"
-
-    eval "printf \"%u\" \${#${1}[@]}"
-}
-
-function array_get
-{
-    if [[ -z "${3}" ]]
-    then
-        common_assert "common_is_variable `string_escape "${1}"`"
-        common_assert "math_is_integer `string_escape "${2}"` && [[ ${2} -ge 0 ]]"
-
-        eval "string_escape \"\${${1}[${2}]}\""
-    else
-        common_assert "common_is_variable `string_escape "${3}"`"
-
-        eval "${3}=`array_get "${1}" "${2}"`"
-    fi
-}
-
-function array_set
-{
-    common_assert "common_is_variable `string_escape "${1}"`"
-    common_assert "math_is_integer `string_escape "${2}"` && [[ ${2} -ge 0 ]]"
-
-    eval "${1}[${2}]=`string_escape "${3}"`"
-}
-
-function array_append
-{
-    common_assert "common_is_variable `string_escape "${1}"`"
-
-    eval "${1}+=(`string_escape "${2}"`)"
-}
-
-function array_get_elements
-{
-    common_assert "common_is_variable `string_escape "${1}"`"
-
-    function array_get_elements_serialize
-    {
-        local offset=$(( ${#} / 2 + 1 ))
-
-        if [[ ${#} -ge ${offset} ]]
-        then
-            printf '[%q]=%q' "${1}" "${!offset}"
-            shift
-
-            while [[ ${#} -ge ${offset} ]]
-            do
-                printf ' [%q]=%q' "${1}" "${!offset}"
-                shift
-            done
-        fi
-    }
-    eval "array_get_elements_serialize \"\${!${1}[@]}\" \"\${${1}[@]}\""
-
-    local rc=${?}
-    unset -f array_get_elements_serialize
-    return ${rc}
-}
-
-function array_foreach
-{
-    common_assert "common_is_variable `string_escape "${1}"`"
-    common_assert "common_is_function `string_escape "${2}"`"
-    common_assert "[[ ! `string_escape "${2}"` =~ ^array_foreach_ ]]"
-
-    eval "
-        function array_foreach_internal
-        {
-            while [[ \${#} -gt 0 ]]
-            do
-                if ${2} \"\${1}\"
-                then
-                    shift
-                else
-                    return \${?}
-                fi
-            done
-        }
-
-        function array_foreach_wrapper
-        {
-            array_foreach_internal \"\${${1}[@]}\"
-        }
-    " && array_foreach_wrapper
-
-    local rc=${?}
-    unset -f array_foreach_internal
-    unset -f array_foreach_wrapper
-    return ${rc}
-}
-
-function array_contains
-{
-    eval "
-        function array_contains_compare
-        {
-            [[ \"\${1}\" != `string_escape "${2}"` ]]
-        }
-    " && ! array_foreach "${1}" array_contains_compare
-
-    local rc=${?}
-    unset -f array_contains_compare
-    return ${rc}
-}
-
-function array_sort
-{
-    common_assert "common_is_variable `string_escape "${1}"`"
-    common_assert "common_is_function `string_escape "${2}"`"
-    common_assert "[[ ! `string_escape "${2}"` =~ ^array_sort_ ]]"
-    common_assert "[[ `string_escape "${3}"` =~ !? ]]"
-
-    eval "
-        function array_sort_quicksort
-        {
-            local -a left=()
-            local -a right=()
-            local    pivot=""
-
-            if [[ \${#} -eq 0 ]]
-            then
-                return 0
-            fi
-
-            pivot=\"\${1}\"
-            shift
-
-            while [[ \${#} -gt 0 ]]
-            do
-                ${2} \"\${1}\" \"\${pivot}\"
-                if [[ ${3} \${?} -le 1 ]]
-                then
-                    left[\${#left[@]}]=\"\${1}\"
-                else
-                    right[\${#right[@]}]=\"\${1}\"
-                fi
-                shift
-            done
-
-            if [[ \${#left[@]} -gt 0 ]]
-            then
-                array_sort_quicksort \"\${left[@]}\"
-            fi
-            string_escape \"\${pivot}\"
-            printf \"%s\" \"\${IFS}\"
-            if [[ \${#right[@]} -gt 0 ]]
-            then
-                array_sort_quicksort \"\${right[@]}\"
-            fi
-        }
-
-        function array_sort_wrapper
-        {
-            eval \"${1}=(\$(array_sort_quicksort \"\${${1}[@]}\"))\"
-        }
-    " && array_sort_wrapper
-
-    local rc=${?}
-    unset -f array_sort_quicksort
-    unset -f array_sort_wrapper
-    return ${rc}
-}
-
-function array_join
-{
-    common_assert "common_is_variable `string_escape "${1}"`"
-
-    eval "
-        function array_join_internal
-        {
-            printf \"%s\" \"\${1}\"
-            shift
-            while [[ \${#} -gt 0 ]]
-            do
-                printf \"%s%s\" `string_escape "${2:-, }"` \"\${1}\"
-                shift
-            done
-            printf \"\n\"
-        }
-
-        function array_join_wrapper
-        {
-            array_join_internal \"\${${1}[@]}\"
-        }
-    " && array_join_wrapper
-
-    local rc=${?}
-    unset -f array_join_internal
-    unset -f array_join_wrapper
-    return ${rc}
-}
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/common.sh
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/common.sh
@@ -1,578 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011-2014 Benjamin Fleischer
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# Requires array.sh
-# Requires math.sh
-# Requires string.sh
-
-
-declare -a COMMON_LOG_PREFIX=()
-declare -i COMMON_LOG_VERBOSE=2
-
-
-function common_log_initialize
-{
-    common_log_set_verbose ${COMMON_LOG_VERBOSE}
-}
-
-function common_log_set_verbose
-{
-    local verbose="${1}"
-
-    common_assert "math_is_integer `string_escape "${verbose}"`"
-    common_assert "[[ ${verbose} -gt 0 ]]"
-
-    COMMON_LOG_VERBOSE=${verbose}
-
-    if (( COMMON_LOG_VERBOSE > 4 ))
-    then
-        exec 3>&1
-        exec 4>&2
-    else
-        exec 3> /dev/null
-        exec 4> /dev/null
-    fi
-}
-
-function common_log
-{
-    local -a options=()
-    common_getopt options "v:,verbose:,c:,color:,t,trace,o:,offset:" "${@}"
-    common_die_on_error "${options[@]}"
-
-    set -- "${options[@]}"
-
-    local -i verbose=2
-    local    color=""
-    local -i trace=0
-    local -i trace_offset=0
-
-    while [[ ${#} -gt 0 ]]
-    do
-        case "${1}" in
-            --)
-                shift
-                break
-                ;;
-            -v|--verbose)
-                verbose="${2}"
-                shift 2
-                ;;
-            -c|--color)
-                color="${2}"
-                shift 2
-                ;;
-            -t|--trace)
-                trace=1
-                shift
-                ;;
-            -o|--trace-offset)
-                trace_offset="${2}"
-                shift 2
-                ;;
-        esac
-    done
-
-    if (( verbose > COMMON_LOG_VERBOSE ))
-    then
-        return 0
-    fi
-
-    if [[ -z "${color}" ]]
-    then
-        case ${verbose} in
-            1|2)
-                color="1;30"
-                ;;
-            4)
-                color="0;37"
-                ;;
-            [0-9]+)
-                color="0:30"
-                ;;
-        esac
-    fi
-
-    if (( trace == 1 ))
-    then
-        local -a stack=()
-        local -i i=${trace_offset}
-        local    caller=""
-        local    function=""
-        local    file=""
-        local    line=""
-
-        while caller="`caller ${i}`"
-        do
-            function="`/usr/bin/cut -d " " -f 2 <<< "${caller}"`"
-            file="`/usr/bin/cut -d " " -f 3- <<< "${caller}"`"
-            line="`/usr/bin/cut -d " " -f 1 <<< "${caller}"`"
-
-            array_append stack "at ${function} (${file}, line ${line})"
-
-            (( i++ ))
-        done
-
-        set -- "${@}" "${stack[@]}"
-    fi
-
-    while [[ ${#} -gt 0 ]]
-    do
-        if [[ ${#COMMON_LOG_PREFIX[@]} -gt 0 ]]
-        then
-            printf "%-20s | " "${COMMON_LOG_PREFIX}" >&2
-        fi
-        printf "\033[${color}m%s\033[0m\n" "${1}" >&2
-        shift
-    done
-}
-
-function common_log_variable
-{
-    while [[ ${#} -gt 0 ]]
-    do
-        common_log -v 4 -- "`common_variable_print "${1}"`"
-        shift
-    done
-}
-
-function common_warn
-{
-    common_log -v 1 -c "0;31" -o 1 "${@}"
-}
-
-function common_die
-{
-    if [[ ${#} -eq 0 ]]
-    then
-        set -- "Unspecified error"
-    fi
-
-    common_log -v 1 -c "1;31" -o 1 "${@}"
-    echo -ne "\a" >&2
-
-    if (( BASH_SUBSHELL > 0 ))
-    then
-        kill -SIGTERM 0
-    fi
-    exit 1
-}
-
-function common_assert
-{
-    if [[ -n "${1}" ]]
-    then
-        eval "${1}"
-        if (( ${?} != 0 ))
-        then
-            if [[ -n "${2}" ]]
-            then
-                common_die -t -o 2 "${2}"
-            else
-                common_die -t -o 2 "Assertion '${1}' failed"
-            fi
-        fi
-    fi
-}
-
-function common_die_on_error
-{
-    if (( ${?} != 0 ))
-    then
-        common_die "${@}"
-    fi
-}
-
-function common_warn_on_error
-{
-    if (( ${?} != 0 ))
-    then
-        common_warn "${@}"
-    fi
-}
-
-
-function common_signal_trap_initialize
-{
-    local signal=""
-    for signal in SIGINT SIGTERM
-    do
-        trap "common_signal_trap \"${signal}\"" "${signal}"
-    done
-}
-
-function common_signal_trap
-{
-    local signal="${1}"
-
-    common_log -v 4 "Received signal: ${signal}"
-    case "${signal}" in
-        SIGINT)
-            common_warn "Aborted by user"
-            exit 130
-            ;;
-        SIGTERM)
-            exit 143
-            ;;
-        *)
-            common_warn "Ignore signal: ${signal}"
-            ;;
-    esac
-}
-
-
-function common_getopt
-{
-	function common_getopt_internal
-	{
-        local variable="${1}"
-
-        local -a specs=()
-        IFS="," read -ra specs <<< "${2}"
-
-        common_assert "array_is_array `string_escape ${variable}`"
-
-        local -i error=0
-        local -a out=()
-
-        function common_getopt_spec
-	    {
-	        case "${1: -1}" in
-	            ":")
-	                common_variable_set "${2}" "${1:0:$((${#1} - 1))}"
-	                common_variable_set "${3}" 1
-	                ;;
-	            "?")
-	                common_variable_set "${2}" "${1:0:$((${#1} - 1))}"
-	                common_variable_set "${3}" 2
-	                ;;
-	            *)
-	                common_variable_set "${2}" "${1}"
-	                common_variable_set "${3}" 0
-	                ;;
-	        esac
-	    }
-
-	    local    spec_name=""
-	    local -i spec_has_argument=0
-
-	    local    option=""
-	    local    option_name=""
-	    local    option_argument=""
-	    local -i option_has_argument=0
-
-	    local -i match_found=0
-	    local    match_name=""
-	    local -i match_has_argument=0
-
-        shift 2
-	    while [[ ${#} -gt 0 ]]
-	    do
-	        case ${1} in
-	            --)
-	                break
-	                ;;
-	            -)
-	                out+=("--")
-	                break
-	                ;;
-	            --*)
-		            option="${1:2}"
-		            shift
-
-		            option_name="`/usr/bin/sed -E -n -e 's/^([^=]*).*$/\1/p' <<< "${option}"`"
-		            option_argument="`/usr/bin/sed -E -n -e 's/^[^=]*=(.*)$/\1/p' <<< "${option}"`"
-
-		            [[ ! "${option}" =~ "=" ]]
-		            option_has_argument=${?}
-
-		            match_found=0
-		            match_name=""
-		            match_has_argument=0
-		            for spec in "${specs[@]}"
-		            do
-		                common_getopt_spec "${spec}" spec_name spec_has_argument
-
-		                if [[ ${#spec_name} -eq 1 ]]
-		                then
-		                    continue
-		                fi
-
-		                if [[ "${spec_name:0:${#option_name}}" = "${option_name}" ]]
-		                then
-		                    match_name="${spec_name}"
-		                    match_has_argument=${spec_has_argument}
-
-		                    if [[ ${#spec_name} -eq ${#option_name} ]]
-		                    then
-		                        match_found=1
-		                        break
-		                    elif (( match_found != 0 ))
-		                    then
-                                error=1
-                                out=("Option '${option_name}' is ambiguous")
-                                break 2
-		                    else
-		                        match_found=1
-		                    fi
-		                fi
-		            done
-		            if (( match_found == 0 ))
-		            then
-                        error=1
-                        out=("Illegal option '${option_name}'")
-                        break
-		            fi
-		            if (( match_has_argument != 2 && option_has_argument != match_has_argument ))
-		            then
-                        error=1
-                        if (( option_has_argument == 0 ))
-                        then
-                            out=("Option '${option_name}' requires an argument")
-                        else
-                            out=("Option '${option_name}' does not allow an argument")
-                        fi
-                        break
-		            fi
-
-		            out+=("--${match_name}")
-		            if (( match_has_argument != 0 ))
-		            then
-		                out+=("${option_argument}")
-		            fi
-		        	;;
-		        -*)
-		            option="${1:1}"
-		            shift
-
-		            option_name="${option:0:1}"
-		            option_argument="${option:1}"
-
-		            match_found=0
-		            for spec in "${specs[@]}"
-		            do
-		                common_getopt_spec "${spec}" spec_name spec_has_argument
-
-		                if [[ "${option_name}" = "${spec_name}" ]]
-		                then
-		                    match_found=1
-
-		                    out+=("-${option_name}")
-		                    if (( spec_has_argument == 0 ))
-		                    then
-		                        if [[ -n "${option_argument}" ]]
-		                        then
-		                            set -- "-${option_argument}" "${@}"
-		                        fi
-		                    else
-		                        if [[ -z "${option_argument}" ]]
-		                        then
-		                            if [[ ${#} -le 0 ]]
-		                            then
-                                        error=1
-                                        out=("Option '${option_name}' requires an argument")
-                                        break 2
-		                            fi
-		                            option_argument="${1}"
-		                            shift
-		                        fi
-
-		                        out+=("${option_argument}")
-		                    fi
-		                    break
-		                fi
-		            done
-
-		            if (( match_found == 0 ))
-		            then
-                        error=1
-                        out=("Illegal option '${option_name}'")
-                        break
-		            fi
-		        	;;
-		        *)
-		            out+=("--")
-		            break
-		        	;;
-	        esac
-	    done
-
-        if (( error == 0 ))
-        then
-            out+=("${@}")
-        fi
-
-        printf "%s=%s\n" "${variable}" "`common_variable_clone out`"
-        printf "return %d\n" ${error}
-	}
-
-    eval "`common_getopt_internal "${@}"`"
-}
-
-function common_sudo
-{
-    local prompt="${1}"
-
-    common_assert "[[ -n `string_escape "${prompt}"` ]]"
-    common_assert "[[ ${#} -gt 1 ]]"
-
-    if [[ ${#COMMON_LOG_PREFIX[@]} -gt 0 ]]
-    then
-        prompt="`printf "%-20s | %s" "${COMMON_LOG_PREFIX}" "${prompt}"`"
-    fi
-
-    sudo -p "${prompt}: " "${@:2}"
-}
-
-
-function common_is_function
-{
-    [[ "`type -t "${1}"`" == "function" ]]
-}
-
-function common_function_is_legal_name
-{
-    [[ "${1}" =~ ^[a-zA-Z_][0-9a-zA-Z_]*$ ]]
-}
-
-
-function common_is_variable
-{
-    compgen -A variable | grep ^"${1}"$ > /dev/null
-}
-
-function common_variable_is_legal_name
-{
-    [[ "${1}" =~ ^[a-zA-Z_][0-9a-zA-Z_]*$ ]]
-}
-
-function common_variable_is_readonly
-{
-    if common_is_variable "${1}"
-    then
-        [[ "`declare -p "${1}" 2> /dev/null`" =~ ^"declare -"[^=]{0,}"r"[^=]{0,}" ${1}=" ]]
-    fi
-}
-
-function common_variable_get
-{
-    common_assert "common_is_variable `string_escape "${1}"`"
-
-    string_escape "${!1}"
-}
-
-function common_variable_set
-{
-    common_assert "common_variable_is_legal_name `string_escape "${1}"`"
-
-    eval "${1}=`string_escape "${2}"`"
-}
-
-function common_variable_clone
-{
-    if [[ -z "${2}" ]]
-    then
-        common_assert "common_is_variable `string_escape "${1}"`"
-
-        if array_is_array "${1}"
-        then
-            printf "("
-            array_get_elements "${1}"
-            printf ")"
-        else
-            common_variable_get "${1}"
-        fi
-    else
-        common_assert "common_variable_is_legal_name `string_escape "${2}"`"
-
-        eval "${2}=`common_variable_clone "${1}"`"
-    fi
-}
-
-function common_variable_print
-{
-    common_assert "common_is_variable `string_escape "${1}"`"
-
-    printf "%s=" "${1}"
-    common_variable_clone "${1}"
-    printf "\n"
-}
-
-function common_variable_require
-{
-    while [[ ${#} -gt 0 ]]
-    do
-        if ! common_is_variable "${1}"
-        then
-            common_die "Variable not declared: ${1}"
-        fi
-        shift
-    done
-}
-
-function common_variable_expand
-{
-    while [[ ${#} -gt 0 ]]
-    do
-        eval "echo \${!${1}@}"
-        shift
-    done
-}
-
-
-function common_path_absolute
-{
-    local    path="${1}"
-    local -a tokens=()
-    local -i tokens_count=0
-    local -i i=0
-
-    if [[ ! "${path}" =~ ^/ ]]
-    then
-        path="`pwd -P`/${path}"
-    fi
-    IFS="/" read -ra tokens <<< "${path}"
-    tokens_count=${#tokens[@]}
-
-    for (( i=0 ; i < ${tokens_count} ; i++ ))
-    do
-        case "${tokens[${i}]}" in
-            .|"")
-                unset -v tokens[${i}]
-                ;;
-            ..)
-                unset -v tokens[$(( i - 1 ))]
-                unset -v tokens[${i}]
-                ;;
-        esac
-    done
-
-    printf "/"
-    array_join tokens "/"
-}
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/installer.sh
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/installer.sh
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2014 Benjamin Fleischer
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-function installer_is_package_installed
-{
-    local identifier="${1}"
-
-    /usr/sbin/pkgutil --pkg-info "${identifier}" > /dev/null 2>&1
-}
-
-function installer_package_get_info
-{
-    local identifier="${1}"
-    local field="${2}"
-
-    local info=""
-    info="`/usr/sbin/pkgutil --pkg-info "${identifier}" 2> /dev/null`"
-
-    if [[ ${?} -eq 0 ]]
-    then
-        /usr/bin/sed -E -n -e "s/^${field}: (.*)$/\1/p" <<< "${info}"
-    else
-        return 1
-    fi
-}
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/macos.sh
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/macos.sh
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011-2016 Benjamin Fleischer
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# Requires common.sh
-
-
-function macos_get_version
-{
-    sw_vers -productVersion | /usr/bin/cut -d . -f 1,2 2> /dev/null
-}
-
-function macos_unload_kext
-{
-    local identifier="${1}"
-
-    common_assert "[[ -n `string_escape "${identifier}"` ]]"
-
-    if [[ -n "`/usr/sbin/kextstat -l -b "${identifier}"`" ]]
-    then
-        /sbin/kextunload -b "${identifier}" 1>&3 2>&4
-    else
-        return 0
-    fi
-}
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/math.sh
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/math.sh
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011-2014 Benjamin Fleischer
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# Requires common.sh
-# Requires string.sh
-
-
-function math_is_integer
-{
-    [[ "${1}" =~ ^-?[0-9]+$ ]]
-}
-
-function math_compare
-{
-    if (( ${1} < ${2} ))
-    then
-        return 1
-    fi
-    if (( ${1} > ${2} ))
-    then
-        return 2
-    fi
-    return 0
-}
-
-function math_max
-{
-    common_assert "math_is_integer `string_escape "${1}"`"
-    common_assert "math_is_integer `string_escape "${2}"`"
-
-    if (( ${1} > ${2} ))
-    then
-        printf "%s" "${1}"
-    else
-        printf "%s" "${2}"
-    fi
-}
-
-function math_min
-{
-    common_assert "math_is_integer `string_escape "${1}"`"
-    common_assert "math_is_integer `string_escape "${2}"`"
-
-    if (( ${1} < ${2} ))
-    then
-        printf "%s" "${1}"
-    else
-        printf "%s" "${2}"
-    fi
-}
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/osxfuse.sh
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/osxfuse.sh
@@ -1,160 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2014 Benjamin Fleischer
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# Requires common.sh
-
-
-function osxfuse_uninstall_macfuse
-{
-    /bin/rm -rf "/Library/Application Support/Developer/Shared/Xcode/Project Templates/MacFUSE"
-    /bin/rm -rf "/Library/Filesystems/fusefs.fs"
-    /bin/rm -rf "/Library/Frameworks/MacFUSE.framework"
-    /bin/rm -rf "/Library/PreferencePanes/MacFUSE.prefPane"
-    /bin/rm -f "/Library/Preferences/com.google.macfuse.plist"
-    /bin/rm -rf "/usr/local/include/fuse"
-    /bin/rm -f "/usr/local/include/fuse.h"
-    /bin/rm -f "/usr/local/lib/libfuse.0.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse.2.7.3.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse.2.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse.la"
-    /bin/rm -f "/usr/local/lib/libfuse_ino64.2.7.3.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse_ino64.2.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse_ino64.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse_ino64.la"
-    /bin/rm -f "/usr/local/lib/pkgconfig/fuse.pc"
-
-    /bin/rm -rf "/Library/Receipts/MacFUSE.pkg"
-    /bin/rm -rf "/Library/Receipts/MacFUSE Core.pkg"
-
-    /usr/sbin/pkgutil --forget "com.google.macfuse" 1>&3 2>&4
-    /usr/sbin/pkgutil --forget "com.google.macfuse.core" 1>&3 2>&4
-
-    return 0
-}
-
-function osxfuse_uninstall_osxfuse_2_core
-{
-    /bin/rm -rf "/Library/Filesystems/osxfusefs.fs"
-    /bin/rm -rf "/Library/Frameworks/OSXFUSE.framework"
-    /bin/rm -rf "/usr/local/include/osxfuse"
-    /bin/rm -f "/usr/local/lib/libosxfuse.2.dylib"
-    /bin/rm -f "/usr/local/lib/libosxfuse.dylib"
-    /bin/rm -f "/usr/local/lib/libosxfuse.la"
-    /bin/rm -f "/usr/local/lib/libosxfuse_i32.2.dylib"
-    /bin/rm -f "/usr/local/lib/libosxfuse_i32.dylib"
-    /bin/rm -f "/usr/local/lib/libosxfuse_i32.la"
-    /bin/rm -f "/usr/local/lib/libosxfuse_i64.2.dylib"
-    /bin/rm -f "/usr/local/lib/libosxfuse_i64.dylib"
-    /bin/rm -f "/usr/local/lib/libosxfuse_i64.la"
-    /bin/rm -f "/usr/local/lib/pkgconfig/fuse.pc"
-    /bin/rm -f "/usr/local/lib/pkgconfig/osxfuse.pc"
-
-    /usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.Core" 1>&3 2>&4
-
-    return 0
-}
-
-function osxfuse_uninstall_osxfuse_2_macfuse
-{
-    /bin/rm -rf "/Library/Frameworks/MacFUSE.framework"
-    /bin/rm -f "/usr/local/lib/libfuse.0.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse.2.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse.la"
-    /bin/rm -f "/usr/local/lib/libfuse_ino64.2.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse_ino64.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse_ino64.la"
-    /bin/rm -f "/usr/local/lib/libmacfuse_i32.2.dylib"
-    /bin/rm -f "/usr/local/lib/libmacfuse_i32.dylib"
-    /bin/rm -f "/usr/local/lib/libmacfuse_i64.2.dylib"
-    /bin/rm -f "/usr/local/lib/libmacfuse_i64.dylib"
-
-    /usr/sbin/pkgutil --forget "com.google.macfuse.core" 1>&3 2>&4
-
-    return 0
-}
-
-function osxfuse_uninstall_osxfuse_2_prefpane
-{
-    /bin/rm -rf "/Library/PreferencePanes/OSXFUSE.prefPane"
-    /bin/rm -f "/Library/Preferences/com.github.osxfuse.OSXFUSE.plist"
-
-    /usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.PrefPane" 1>&3 2>&4
-
-    return 0
-}
-
-function osxfuse_uninstall_osxfuse_3_core
-{
-    /bin/rm -rf "/Library/Filesystems/osxfuse.fs"
-    /bin/rm -rf "/Library/Frameworks/OSXFUSE.framework"
-    /bin/rm -rf "/usr/local/include/osxfuse"
-    /bin/rm -f "/usr/local/lib/libosxfuse.2.dylib"
-    /bin/rm -f "/usr/local/lib/libosxfuse.dylib"
-    /bin/rm -f "/usr/local/lib/libosxfuse.la"
-    /bin/rm -f "/usr/local/lib/libosxfuse_i64.2.dylib"
-    /bin/rm -f "/usr/local/lib/libosxfuse_i64.dylib"
-    /bin/rm -f "/usr/local/lib/libosxfuse_i64.la"
-    /bin/rm -f "/usr/local/lib/pkgconfig/fuse.pc"
-    /bin/rm -f "/usr/local/lib/pkgconfig/osxfuse.pc"
-
-    /usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.Core" 1>&3 2>&4
-
-    return 0
-}
-
-function osxfuse_uninstall_osxfuse_3_macfuse
-{
-    /bin/rm -rf "/Library/Frameworks/MacFUSE.framework"
-    /bin/rm -rf "/usr/local/include/fuse"
-    /bin/rm -f "/usr/local/include/fuse.h"
-    /bin/rm -f "/usr/local/lib/libfuse.0.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse.2.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse.la"
-    /bin/rm -f "/usr/local/lib/libfuse_ino64.2.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse_ino64.dylib"
-    /bin/rm -f "/usr/local/lib/libfuse_ino64.la"
-    /bin/rm -f "/usr/local/lib/pkgconfig/macfuse.pc"
-
-    /usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.MacFUSE" 1>&3 2>&4
-
-    return 0
-}
-
-function osxfuse_uninstall_osxfuse_3_prefpane
-{
-    /bin/rm -rf "/Library/PreferencePanes/OSXFUSE.prefPane"
-    /bin/rm -f "/Library/Preferences/com.github.osxfuse.OSXFUSE.plist"
-
-    /usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.PrefPane" 1>&3 2>&4
-
-    return 0
-}
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/string.sh
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/string.sh
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011-2014 Benjamin Fleischer
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-function string_trim
-{
-    local string="${1}"
-
-    ! shopt -q extglob
-    local -i extglob=${?}
-
-    if (( extglob == 0 ))
-    then
-        shopt -s extglob
-    fi
-
-    string="${string##+([[:space:]])}"
-    string="${string%%+([[:space:]])}"
-
-    if (( extglob == 0 ))
-    then
-        shopt -u extglob
-    fi
-
-    printf "%s" "${string}"
-}
-
-function string_lowercase
-{
-    /usr/bin/tr '[A-Z]' '[a-z]'
-}
-
-function string_uppercase
-{
-    /usr/bin/tr '[a-z]' '[A-Z]'
-}
-
-function string_escape
-{
-    local count="${2:-1}"
-
-    if [[ "${count}" =~ [0-9]+ ]] && (( count > 0 ))
-    then
-        printf "%q" "`string_escape "${1}" $(( count - 1 ))`"
-    else
-        printf "%s" "${1}"
-    fi
-}
-
-function string_compare
-{
-    if [[ "${1}" < "${2}" ]]
-    then
-        return 1
-    fi
-    if [[ "${1}" > "${2}" ]]
-    then
-        return 2
-    fi
-    return 0
-}
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/version.sh
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/version.sh
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011-2014 Benjamin Fleischer
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# Requires common.sh
-# Requires math.sh
-# Requires string.sh
-
-
-function version_is_version
-{
-    [[ "${1}" =~ ^[0-9]+(\.[0-9]+)*$ ]]
-}
-
-function version_compare
-{
-    common_assert "version_is_version `string_escape "${1}"`"
-    common_assert "version_is_version `string_escape "${2}"`"
-
-    local -a version1=()
-    local -a version2=()
-
-    IFS="." read -ra version1 <<< "${1}"
-    IFS="." read -ra version2 <<< "${2}"
-
-    local -i i=0
-    local    t1=""
-    local    t2=""
-    for (( i=0 ; i < `math_max ${#version1[@]} ${#version2[@]}` ; i++ ))
-    do
-        t1=${version1[${i}]:-0}
-        t2=${version2[${i}]:-0}
-
-        if (( t1 < t2 ))
-        then
-            return 1
-        fi
-        if (( t1 > t2 ))
-        then
-            return 2
-        fi
-    done
-    return 0
-}
-
-function version_compare_eq
-{
-    version_compare "${1}" "${2}"
-    (( ${?} == 0 ))
-}
-
-function version_compare_le
-{
-    version_compare "${1}" "${2}"
-    (( ${?} != 2 ))
-}
-
-function version_compare_ge
-{
-    version_compare "${1}" "${2}"
-    (( ${?} != 1 ))
-}
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/main.scpt
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/main.scpt
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/uninstall_osxfuse.sh
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/uninstall_osxfuse.sh
@@ -1,137 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2014 Benjamin Fleischer
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-function uninstall_osxfuse_main
-{
-    # Source libraries
-
-    local library_path=""
-    for library_path in "${BASH_SOURCE[0]%/*}/lib"/*.sh
-    do
-        if [[ -f "${library_path}" ]]
-        then
-            source "${library_path}" || return 1
-        fi
-    done
-
-    common_log_initialize
-    common_signal_trap_initialize
-
-    # Uninstall core
-
-    local core_version="`installer_package_get_info com.github.osxfuse.pkg.Core version`"
-
-    if [[ -z "${core_version}" ]]
-    then
-        if [[ -e "/Library/Filesystems/osxfuse.fs" ]]
-        then
-            core_version="3.0"
-
-        elif [[ -e "/Library/Filesystems/osxfusefs.fs" ]]
-        then
-            core_version="2.3"
-        fi
-    fi
-
-    if [[ -n "${core_version}" ]]
-    then
-        if version_compare_ge "${core_version}" 3.0
-        then
-            macos_unload_kext "com.github.osxfuse.filesystems.osxfuse"
-            osxfuse_uninstall_osxfuse_3_core
-
-        elif version_compare_ge "${core_version}" 2.3
-        then
-            macos_unload_kext "com.github.osxfuse.filesystems.osxfusefs"
-            osxfuse_uninstall_osxfuse_2_core
-        fi
-    fi
-
-    # Uninstall preference pane
-
-    local prefpane_version="`installer_package_get_info com.github.osxfuse.pkg.PrefPane version`"
-
-    if [[ -z "${prefpane_version}" ]]
-    then
-        if [[ -e "/Library/PreferencePanes/OSXFUSE.prefPane" ]]
-        then
-            prefpane_version="3.0"
-        fi
-    fi
-
-    if [[ -n "${prefpane_version}" ]]
-    then
-        if version_compare_ge "${prefpane_version}" 3.0
-        then
-            osxfuse_uninstall_osxfuse_3_prefpane
-
-        elif version_compare_ge "${prefpane_version}" 2.3
-        then
-            osxfuse_uninstall_osxfuse_2_prefpane
-        fi
-    fi
-
-    # Uninstall MacFUSE compatibility layer
-
-    local macfuse_version="`installer_package_get_info com.github.osxfuse.pkg.MacFUSE version`"
-
-    if [[ -z "${macfuse_version}" ]]
-    then
-        macfuse_version="`installer_package_get_info com.google.macfuse.core version`"
-    fi
-
-    if [[ -z "${macfuse_version}" ]]
-    then
-        if [[ -e /usr/local/lib/pkgconfig/macfuse.pc ]]
-        then
-            macfuse_version="3.0"
-
-        elif [[ -e /usr/local/lib/libmacfuse_i32.2.dylib ]]
-        then
-            macfuse_version="2.3"
-        fi
-    fi
-
-    if [[ -n "${macfuse_version}" ]]
-    then
-        if version_compare_ge "${macfuse_version}" 3.0
-        then
-            osxfuse_uninstall_osxfuse_3_macfuse
-
-        elif version_compare_ge "${macfuse_version}" 2.3
-        then
-            osxfuse_uninstall_osxfuse_2_macfuse
-        fi
-    fi
-
-    return 0
-}
-
-uninstall_osxfuse_main "${@}"
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/Uninstaller.icns
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/Uninstaller.icns
--- a/admin/osx/fuse/Uninstaller.app/Contents/Resources/applet.rsrc
+++ b/admin/osx/fuse/Uninstaller.app/Contents/Resources/applet.rsrc
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`c8d0f788e00bdae125a26d9159ce9efdd6325cd2 # Initial application of clang-format`