Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 nextcloud-client (2.3.3-20180415.190957~xenial1) xenial; urgency=medium
 .
   * SFTP upload fix to retrieve SSH keys (#246)
Author: István Váradi <ivaradi@users.noreply.github.com>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- nextcloud-client-2.3.3.orig/README.md
+++ nextcloud-client-2.3.3/README.md
@@ -40,7 +40,7 @@ deb http://download.opensuse.org/reposit
 Before installing, you also need to add the respository's key to the list of trusted APT keys with a command line:
 
 ```
-wget -q -O - <repository URL>/Release.key | apt-key add -y
+wget -q -O - <repository URL>/Release.key | apt-key add
 ```
 
 For example (as root):
--- /dev/null
+++ nextcloud-client-2.3.3/linux/debian/nextcloud-client/debian.bionic/changelog
@@ -0,0 +1,17 @@
+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
--- nextcloud-client-2.3.3.orig/linux/debian/nextcloud-client/debian.stable/control
+++ nextcloud-client-2.3.3/linux/debian/nextcloud-client/debian.stable/control
@@ -33,6 +33,7 @@ Homepage: https://github.com/nextcloud/c
 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
--- nextcloud-client-2.3.3.orig/linux/debian/nextcloud-client/debian.trusty/control
+++ nextcloud-client-2.3.3/linux/debian/nextcloud-client/debian.trusty/control
@@ -12,6 +12,7 @@ Homepage: https://github.com/nextcloud/c
 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
--- nextcloud-client-2.3.3.orig/linux/debian/nextcloud-client/debian/control
+++ nextcloud-client-2.3.3/linux/debian/nextcloud-client/debian/control
@@ -33,6 +33,7 @@ Homepage: https://github.com/nextcloud/c
 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
--- nextcloud-client-2.3.3.orig/linux/debian/nextcloud-client/debian/nextcloud-client-dolphin.install
+++ nextcloud-client-2.3.3/linux/debian/nextcloud-client/debian/nextcloud-client-dolphin.install
@@ -1,4 +1,4 @@
 usr/lib/*/libnextclouddolphinpluginhelper.so
-usr/lib/*/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
-usr/lib/*/plugins/nextclouddolphinactionplugin.so
+usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
+usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
 usr/share/kservices5/nextclouddolphinactionplugin.desktop
--- nextcloud-client-2.3.3.orig/linux/debian/nextcloud-client/debian/patches/series
+++ nextcloud-client-2.3.3/linux/debian/nextcloud-client/debian/patches/series
@@ -1,2 +1,3 @@
 fix-application-icon-name.patch
 fix-syncstate-appname.patch
+set-kde-use-qt-sys-path.patch
--- /dev/null
+++ nextcloud-client-2.3.3/linux/debian/nextcloud-client/debian/patches/set-kde-use-qt-sys-path.patch
@@ -0,0 +1,10 @@
+--- nextcloud-client_2.3.0.orig/client/shell_integration/dolphin/CMakeLists.txt	2018-02-25 13:15:53.775971301 +0100
++++ nextcloud-client_2.3.0/client/shell_integration/dolphin/CMakeLists.txt	2018-02-25 13:15:57.584003567 +0100
+@@ -4,6 +4,7 @@
+ include(FeatureSummary)
+ set(QT_MIN_VERSION "5.3.0")
+ set(KF5_MIN_VERSION "5.16.0")
++set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install the plugin in the right directory")
+ 
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Network)
+ 
--- nextcloud-client-2.3.3.orig/linux/debian/travis-build.sh
+++ nextcloud-client-2.3.3/linux/debian/travis-build.sh
@@ -5,8 +5,8 @@ shopt -s extglob
 
 TRAVIS_BUILD_STEP="$1"
 
-PPA=ppa:nextcloud-devs/client
-PPA_BETA=ppa:nextcloud-devs/client-beta
+PPA=sppa:nextcloud-devs/client
+PPA_BETA=sppa:nextcloud-devs/client-beta
 
 OBS_PROJECT=home:ivaradi
 OBS_PROJECT_BETA=home:ivaradi:beta
@@ -14,16 +14,19 @@ OBS_PACKAGE=nextcloud-client
 
 if [ "$TRAVIS_BUILD_STEP" == "install" ]; then
     sudo apt-get update -q
-    sudo apt-get install -y devscripts cdbs osc
+    sudo apt-get install -y devscripts cdbs osc python-paramiko
 
     if test "$encrypted_585e03da75ed_key" -a "$encrypted_585e03da75ed_iv"; then
         openssl aes-256-cbc -K $encrypted_585e03da75ed_key -iv $encrypted_585e03da75ed_iv -in linux/debian/signing-key.txt.enc -d | gpg --import
         echo "DEBUILD_DPKG_BUILDPACKAGE_OPTS='-k7D14AA7B'" >> ~/.devscripts
 
+        openssl aes-256-cbc -K $encrypted_585e03da75ed_key -iv $encrypted_585e03da75ed_iv -in linux/debian/ssh-key.txt.enc -d > ~/.ssh/id_rsa
+        chmod 0400 ~/.ssh/id_rsa
+
         openssl aes-256-cbc -K $encrypted_585e03da75ed_key -iv $encrypted_585e03da75ed_iv -in linux/debian/oscrc.enc -out ~/.oscrc -d
     elif test "$encrypted_8da7a4416c7a_key" -a "$encrypted_8da7a4416c7a_iv"; then
         openssl aes-256-cbc -K $encrypted_8da7a4416c7a_key -iv $encrypted_8da7a4416c7a_iv -in linux/debian/oscrc.enc -out ~/.oscrc -d
-        PPA=ppa:ivaradi/nextcloud-client-exp
+        PPA=sppa:ivaradi/nextcloud-client-exp
     fi
 
 elif [ "$TRAVIS_BUILD_STEP" == "script" ]; then
@@ -51,7 +54,7 @@ elif [ "$TRAVIS_BUILD_STEP" == "script"
         origsourceopt="-sa"
     fi
 
-    for distribution in xenial zesty artful stable; do
+    for distribution in xenial zesty artful bionic stable; do
         rm -rf nextcloud-client_${basever}
         cp -a client_theming nextcloud-client_${basever}
 
@@ -95,6 +98,16 @@ elif [ "$TRAVIS_BUILD_STEP" == "ppa_depl
     OBS_SUBDIR="${OBS_PROJECT}/${OBS_PACKAGE}"
 
     if test "$encrypted_585e03da75ed_key" -a "$encrypted_585e03da75ed_iv"; then
+        ssh-keyscan ppa.launchpad.net >> ~/.ssh/known_hosts
+
+        cat > ~/.dput.cf <<EOF
+[sppa]
+fqdn			= ppa.launchpad.net
+method			= sftp
+incoming		= ~%(sppa)s
+login	                = ivaradi
+EOF
+
         for changes in nextcloud-client_*~+([a-z])1_source.changes; do
             dput $PPA $changes > /dev/null
         done
