--- owncloud-client-2.3.3.orig/CMakeLists.txt
+++ owncloud-client-2.3.3/CMakeLists.txt
@@ -22,16 +22,19 @@
     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}")
 
-set(PACKAGE "${APPLICATION_SHORTNAME}-client")
+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( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
 if(NOT CRASHREPORTER_EXECUTABLE)
@@ -120,7 +123,22 @@
    add_definitions(-DNO_MSG_HANDLER=1)
 endif()
 
-# this option creates only libocsync and libowncloudsync
+# 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)
 option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)
 
 # When this option is enabled, 5xx errors are not added to the blacklist
@@ -153,30 +171,32 @@
   set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()
 
-find_package(OpenSSL 1.0.0 REQUIRED)
+if(BUILD_CLIENT)
+    find_package(OpenSSL 1.0.0 REQUIRED)
 
-if(APPLE)
-  find_package(Sparkle)
-endif(APPLE)
-
-if(UNIX)
-  find_package(INotify REQUIRED)
-else()
-  find_package(INotify)
-endif()
-find_package(Sphinx)
-find_package(PdfLatex)
+    if(APPLE)
+    find_package(Sparkle)
+    endif(APPLE)
+
+    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})
-    if (WIN32)
-        add_definitions(-DSQLITE_API=__declspec\(dllimport\))
+    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})
+        if (WIN32)
+            add_definitions(-DSQLITE_API=__declspec\(dllimport\))
+        endif()
     endif()
-endif()
 
-find_package(ZLIB)
+    find_package(ZLIB)
+endif()
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
@@ -195,14 +215,19 @@
 file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})
 
-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(BUILD_CLIENT)
+    add_subdirectory(csync)
+    add_subdirectory(src)
+    if(NOT BUILD_LIBRARIES_ONLY)
+        add_subdirectory(doc)
+        add_subdirectory(doc/dev)
+        add_subdirectory(admin)
+    endif()
+endif()
+
+if(BUILD_SHELL_INTEGRATION)
+    add_subdirectory(shell_integration)
+endif()
 
 if(UNIT_TESTING)
     include(CTest)
@@ -213,7 +238,7 @@
 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)
-else()
+elseif(BUILD_CLIENT)
     install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
     configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
 endif()
--- owncloud-client-2.3.3.orig/OWNCLOUD.cmake
+++ owncloud-client-2.3.3/OWNCLOUD.cmake
@@ -1,9 +1,12 @@
 set( APPLICATION_NAME       "ownCloud" )
+set( APPLICATION_SHORTNAME  "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( LINUX_PACKAGE_SHORTNAME "owncloud" )
+
 set( THEME_CLASS            "ownCloudTheme" )
 set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
 set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
--- owncloud-client-2.3.3.orig/OwnCloudCPack.cmake
+++ owncloud-client-2.3.3/OwnCloudCPack.cmake
@@ -48,7 +48,7 @@
     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\fellody
+    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_SHORTNAME} )     # Installation directory on the target system -> C:\Program Files\${APPLICATION_SHORTNAME}
     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
--- owncloud-client-2.3.3.orig/debian/changelog
+++ owncloud-client-2.3.3/debian/changelog
@@ -0,0 +1,344 @@
+owncloud-client (2.3.3-8294) stable; urgency=medium
+
+  * version number update by debtransform
+
+ -- debtransform <build@opensuse.org>  Sat, 18 Jul 2020 13:07:34 +0000
+
+owncloud-client (2.3.3-1) stable; urgency=medium
+
+  * Updated to 2.3.3
+  * The above changelog entry is autogenerated.
+
+ -- Juergen Weigert <jw@owncloud.com>  Thu, 30 Mar 2017 19:12:54 +0200
+
+owncloud-client (2.3.0~beta1) stable; urgency=low
+
+  * Ooooh, I have a crash. Trying to generate debugsymbol packages...
+
+ -- Jürgen Weigert <jw@owncloud.com>  Mon, 13 Mar 2017 16:33:02 +0100
+
+owncloud-client (2.3.0~beta1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.3.0
+  created by: ./genbranding.pl (V1.13) -o -p isv:ownCloud:community:testing owncloudclient-2.3.0beta1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Wed, 08 Feb 2017 14:33:06 +0000
+
+owncloud-client (2.3.0~pre1-2) stable; urgency=low
+
+  * Reverted according to https://github.com/owncloud/client/issues/5470#issuecomment-275680311
+
+ -- Jürgen Weigert <jw@owncloud.com>  Fri, 03 Feb 2017 14:32:37 +0100
+
+owncloud-client (2.2.4) stable; urgency=low
+
+  Automatically generated branding added. Version=2.2.4
+  created by: ./genbranding.pl (V1.13) -o -p isv:ownCloud:desktop owncloudclient-2.2.4.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Tue, 27 Sep 2016 09:15:49 +0000
+
+owncloud-client (2.2.3) stable; urgency=low
+
+  Automatically generated branding added. Version=2.2.3
+  created by: ./genbranding.pl (V1.13) -o -p isv:ownCloud:desktop owncloudclient-2.2.3.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 08 Aug 2016 13:49:54 +0000
+
+owncloud-client (2.2.2-1) stable; urgency=medium
+
+  * fix missing translations, by adding a separate zip.
+    https://github.com/owncloud/client/issues/4987
+    https://github.com/owncloud/client/issues/4956
+
+ -- Jürgen Weigert <jw@owncloud.com>  Thu, 23 Jun 2016 11:07:16 +0200
+
+owncloud-client (2.2.2) stable; urgency=low
+
+  Automatically generated branding added. Version=2.2.2
+  created by: ./genbranding.pl (V1.13) -o -p isv:ownCloud:desktop owncloudclient-2.2.2.tar.xz ownCloud.tar.xz
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 20 Jun 2016 16:25:35 +0000
+
+owncloud-client (2.2.1-6) stable; urgency=low
+
+  * fix https://github.com/owncloud/client/issues/4957
+
+ -- Jürgen Weigert <jw@owncloud.com>  Fri, 10 Jun 2016 13:55:22 +0200
+
+owncloud-client (2.2.1-5) stable; urgency=low
+
+ * fix https://github.com/owncloud/client/issues/4956
+
+ -- Jürgen Weigert <jw@owncloud.com>  Fri, 10 Jun 2016 13:07:13 +0200
+
+owncloud-client (2.2.1-4) stable; urgency=low
+
+  Automatically generated branding added. Version=2.2.1
+  created by: ./genbranding.pl (V1.13) -o -p isv:ownCloud:desktop owncloudclient-2.2.1.tar.xz ownCloud.tar.xz
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Thu, 09 Jun 2016 11:41:50 +0000
+
+owncloud-client (2.2.1-3) stable; urgency=low
+
+  * added highdpi-6ccd9e8.patch
+    https://github.com/owncloud/client/issues/3414
+
+ -- Jürgen Weigert <jw@owncloud.com>  Tue, 07 Jun 2016 13:31:12 +0200
+
+owncloud-client (2.2.1-2) stable; urgency=low
+
+  * added http://ckamm.de/~kamm/tray-patch.patch for ubuntu.
+    https://github.com/owncloud/client/pull/4947/files
+
+ -- Jürgen Weigert <jw@owncloud.com>  Tue, 07 Jun 2016 12:48:59 +0200
+
+owncloud-client (2.2.1-1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.2.1
+  created by: ./genbranding.pl (V1.13) -o -p isv:ownCloud:community:testing owncloudclient-2.2.1.tar.xz ownCloud.tar.xz
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 06 Jun 2016 09:01:25 +0000
+
+owncloud-client (2.2.1~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.2.1
+  created by: ./genbranding.pl (V1.13) -o -p isv:ownCloud:community:testing owncloudclient-2.2.1rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 30 May 2016 10:23:13 +0000
+
+owncloud-client (2.2.0~rc1-2) stable; urgency=low
+
+  * Require keychain >= 0.6.2 for https://github.com/owncloud/client/issues/4829
+
+ -- Jürgen Weigert <jw@owncloud.com>  Tue, 17 May 2016 16:36:56 +0200
+
+owncloud-client (2.2.0~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.2.0
+  created by: ./genbranding.pl (V1.13) -o -p isv:ownCloud:community:testing owncloudclient-2.2.0rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Tue, 10 May 2016 15:29:33 +0000
+
+owncloud-client (2.2.0~beta2) stable; urgency=low
+
+  Automatically generated branding added. Version=2.2.0
+  created by: ./genbranding.pl (V1.13) -o -p isv:ownCloud:community:testing owncloudclient-2.2.0beta2.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 02 May 2016 14:59:29 +0000
+
+owncloud-client (2.2.0~beta1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.2.0
+  created by: ./genbranding.pl (V1.13) -o -p isv:ownCloud:community:testing owncloudclient-2.2.0beta1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 25 Apr 2016 13:49:24 +0000
+
+owncloud-client (2.1.1~rc2-1) stable; urgency=low
+
+  * Fix https://github.com/owncloud/client/issues/4107
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 18 Apr 2016 22:55:07 +0200
+
+owncloud-client (2.1.1~rc2) stable; urgency=low
+
+  Automatically generated branding added. Version=2.1.1
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.1.1rc2.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 08 Feb 2016 16:10:57 +0000
+
+owncloud-client (2.1.1~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.1.1
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.1.1rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 25 Jan 2016 11:33:42 +0000
+
+owncloud-client (2.1.1~beta1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.1.1
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.1.1beta1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 18 Jan 2016 15:52:27 +0000
+
+owncloud-client (2.1.0~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.1.0
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.1.0rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Thu, 26 Nov 2015 14:06:45 +0000
+
+owncloud-client (2.1.0~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.1.0
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.1.0rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Thu, 26 Nov 2015 12:57:27 +0000
+
+owncloud-client (2.1.0~beta1-2) stable; urgency=low
+
+  * https://github.com/owncloud/client/issues/4145
+    removed dots from descriptions, rephrased to make random capitalization harmless.
+
+ -- Juergen Weigert <jw@owncloud.com>  Thu, 19 Nov 2015 13:22:30 +0100
+
+owncloud-client (2.1.0~beta1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.1.0
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.1.0beta1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Tue, 17 Nov 2015 14:47:45 +0000
+
+owncloud-client (2.0.2~rc2) stable; urgency=low
+
+  Automatically generated branding added. Version=2.0.2
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.0.2rc2.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Tue, 20 Oct 2015 11:17:05 +0000
+
+owncloud-client (2.0.2~rc2) stable; urgency=low
+
+  Automatically generated branding added. Version=2.0.2
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.0.2rc2.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Tue, 20 Oct 2015 09:50:06 +0000
+
+owncloud-client (2.0.2~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.0.2
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.0.2rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Fri, 16 Oct 2015 09:53:56 +0000
+
+owncloud-client (2.0.2~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.0.2
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.0.2rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Fri, 16 Oct 2015 09:25:50 +0000
+
+owncloud-client (2.0.0~rc2) stable; urgency=low
+
+  Automatically generated branding added. Version=2.0.0
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.0.0rc2.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Fri, 21 Aug 2015 14:08:53 +0000
+
+owncloud-client (2.0.0~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.0.0
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.0.0rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Tue, 18 Aug 2015 11:29:20 +0000
+
+owncloud-client (2.0.0~beta2) stable; urgency=low
+
+  Automatically generated branding added. Version=2.0.0
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.0.0beta2.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Sat, 15 Aug 2015 01:26:27 +0000
+
+owncloud-client (2.0.0~beta1-2) stable; urgency=low
+
+  Automatically generated branding added. Version=2.0.0
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.0.0beta1.tar.xz ownCloud.tar.xz
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Fri, 07 Aug 2015 10:53:46 +0000
+
+owncloud-client (2.0.0~beta1-1) stable; urgency=low
+
+  * pamper debian lintian.
+
+ -- Jürgen Weigert <testy@linux-w510-jw.own.cloud>  Fri, 07 Aug 2015 12:30:22 +0200
+
+owncloud-client (2.0.0~beta1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.0.0
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.0.0beta1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Fri, 07 Aug 2015 08:58:26 +0000
+
+owncloud-client (2.0.0~beta1) stable; urgency=low
+
+  Automatically generated branding added. Version=2.0.0
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-2.0.0beta1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Fri, 07 Aug 2015 07:52:30 +0000
+
+owncloud-client (1.8.3~rc3) stable; urgency=low
+
+  Automatically generated branding added. Version=1.8.3
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-1.8.3rc3.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 22 Jun 2015 06:50:30 +0000
+
+owncloud-client (1.8.3~rc2) stable; urgency=low
+
+  Automatically generated branding added. Version=1.8.3
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-1.8.3rc2.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Wed, 17 Jun 2015 15:16:48 +0000
+
+owncloud-client (1.8.3~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=1.8.3
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-1.8.3rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Mon, 15 Jun 2015 10:55:05 +0000
+
+owncloud-client (1.8.3~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=1.8.3
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-1.8.3rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Thu, 11 Jun 2015 13:47:48 +0000
+
+owncloud-client (1.8.3) stable; urgency=low
+
+  Automatically generated branding added. Version=1.8.3
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-1.8.3.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Thu, 11 Jun 2015 13:12:36 +0000
+
+owncloud-client (1.8.2~rc1) stable; urgency=low
+
+  Automatically generated branding added. Version=1.8.2
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-1.8.2rc1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Fri, 05 Jun 2015 08:14:58 +0000
+
+owncloud-client (1.8.2~beta1) stable; urgency=low
+
+  Automatically generated branding added. Version=1.8.2
+  created by: ./genbranding.pl (V1.12) -o -p isv:ownCloud:community:testing owncloudclient-1.8.2beta1.tar.xz ownCloud.tar.xz
+
+
+ -- ownCloud Jenkins <jenkins@owncloud.com>  Fri, 22 May 2015 14:28:18 +0000
+
--- owncloud-client-2.3.3.orig/debian/compat
+++ owncloud-client-2.3.3/debian/compat
@@ -0,0 +1 @@
+9
--- owncloud-client-2.3.3.orig/debian/control
+++ owncloud-client-2.3.3/debian/control
@@ -0,0 +1,100 @@
+Source: owncloud-client
+Section: devel
+Priority: optional
+Maintainer: Jürgen Weigert <jw@owncloud.com>
+Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9), cmake, sed, doxygen, unzip | bash,
+	libsqlite3-dev, python-sphinx | python3-sphinx, libssl-dev,
+	ocqt562-qt5keychain-dev (>= 0.7.0),
+	ocqt562-qt5-qmake,
+	ocqt562-qttools5-dev-tools,
+	ocqt562-qtbase5-dev,
+	ocqt562-libqt5webkit5-dev (>= 2.2.0),
+
+Package: owncloud-client
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}, libowncloudsync0 (= ${binary:Version}), owncloud-client-l10n,
+	ocqt562-libqt5sql5-sqlite
+Suggests: owncloud-client-dolphin,
+	owncloud-client-nautilus,
+	owncloud-client-nemo,
+	owncloud-client-caja
+Description:  The ownCloud sync client - github.com/owncloud/client
+ .
+ ownCloud client enables you to connect to your private
+ ownCloud Server. With it you can create folders in your home
+ directory, and keep the contents of those folders synced with your
+ ownCloud server. Simply copy a file into the directory and the
+ ownCloud Client does the rest.
+ .
+ ownCloud gives your employees anytime, anywhere access to the files
+ they need to get the job done, whether through this desktop application,
+ our mobile apps, the web interface, or other WebDAV clients. With it,
+ your employees can easily view and share documents and information
+ critical to the business, in a secure, flexible and controlled
+ architecture. You can easily extend ownCloud with plug-ins from the
+ community, or that you build yourself to meet the requirements of
+ your infrastructure and business.
+ .
+ ownCloud - Your Cloud, Your Data, Your Way!  www.owncloud.com
+ .
+ Authors
+ =======
+ Duncan Mac-Vicar P. <duncan@kde.org>
+ Klaas Freitag <freitag@owncloud.com>
+ Daniel Molkentin <danimo@owncloud.com>
+ .
+
+Package: owncloud-client-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends:
+    owncloud-client (= ${binary:Version}),
+    ${misc:Depends}
+Description: debugging symbols for owncloud-client
+ This package contains the debugging symbols for owncloud-client.
+
+Package: owncloud-client-doc
+Architecture: all
+Section: devel
+Depends: owncloud-client (= ${binary:Version}), ${misc:Depends}, libowncloudsync0
+Description: development files for the ownCloud sync lib
+ Main package for ownCloud.
+ .
+ This package contains the library development files.
+
+Package: owncloud-client-l10n
+Architecture: all
+Section: devel
+Depends: owncloud-client (>= ${binary:Version}), ${misc:Depends}, libowncloudsync0
+Breaks: owncloud-client (<= 1.5.0)
+Description: Internationalization files for ownCloud
+ Internationalization for ownCloud desktop sync client.
+ .
+ This package contains the translation packages.
+
+Package: libowncloudsync0
+Architecture: any
+Multi-Arch: same
+Section: devel
+Depends: ${misc:Depends}, ${shlibs:Depends},
+	ocqt562-libqt5keychain1
+Pre-Depends: ${misc:Pre-Depends}
+Breaks: libocsync0
+Replaces: libocsync0
+Description: the ownCloud sync library
+ ownCloud uses this as a sync engine implementation.
+ .
+ This package contains the library.
+
+Package: libowncloudsync-dev
+Architecture: any
+Section: devel
+Depends: libowncloudsync0 (= ${binary:Version}), ${misc:Depends}
+Description: development files for the ownCloud sync library
+ ownCloud uses this as a sync engine implementation.
+ .
+ This package contains the development files.
+
--- owncloud-client-2.3.3.orig/debian/copyright
+++ owncloud-client-2.3.3/debian/copyright
@@ -0,0 +1,4 @@
+Files: *
+Copyright: 2012-2015 ownCloud, inc.; Nuernberg, Germany.
+License: GPL-2+
+ See /usr/share/common-licenses/GPL-2
--- owncloud-client-2.3.3.orig/debian/format
+++ owncloud-client-2.3.3/debian/format
@@ -0,0 +1 @@
+3.0 (quilt)
--- owncloud-client-2.3.3.orig/debian/libowncloudsync-dev.install
+++ owncloud-client-2.3.3/debian/libowncloudsync-dev.install
@@ -0,0 +1,3 @@
+/opt/ownCloud/ownCloud/lib/*/libowncloudsync.so
+/opt/ownCloud/ownCloud/lib/*/*/libocsync.so
+/opt/ownCloud/ownCloud/include/owncloudsync/
--- owncloud-client-2.3.3.orig/debian/libowncloudsync0.install
+++ owncloud-client-2.3.3/debian/libowncloudsync0.install
@@ -0,0 +1,3 @@
+/etc/ownCloud/
+/opt/ownCloud/ownCloud/lib/*/libowncloudsync.so.*
+/opt/ownCloud/ownCloud/lib/*/*/libocsync.so.*
--- owncloud-client-2.3.3.orig/debian/libowncloudsync0.lintian-overrides
+++ owncloud-client-2.3.3/debian/libowncloudsync0.lintian-overrides
@@ -0,0 +1 @@
+libowncloudsync0: possible-gpl-code-linked-with-openssl
--- owncloud-client-2.3.3.orig/debian/libowncloudsync0.postinst
+++ owncloud-client-2.3.3/debian/libowncloudsync0.postinst
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+#
+# emulate apt-get -o Dpkg::Options::="--force-confmiss" install --reinstall
+# Try to harvest any captured config files captured in preinst.
+conf=/etc/ownCloud/sync-exclude.lst
+if [ ! -s $conf -a -s $conf.dpkg-new ]; then
+  rm -f $conf
+  echo "$0: Installing new config file $conf"
+  mv $conf.dpkg-new $conf || true
+fi
+
+
+#DEBHELPER#
+exit 0
--- owncloud-client-2.3.3.orig/debian/libowncloudsync0.preinst
+++ owncloud-client-2.3.3/debian/libowncloudsync0.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+#
+# emulate apt-get -o Dpkg::Options::="--force-confmiss" install --reinstall
+# Try to capture the new config file as it whisses by, to be picked up by postinst
+conf=/etc/ownCloud/sync-exclude.lst
+if [ ! -s $conf ]; then
+  mkdir -p /etc/ownCloud
+  ln -s none $conf.dpkg-tmp
+  ln -s none $conf.dpkg-new
+fi
+
+#DEBHELPER#
+exit 0
--- owncloud-client-2.3.3.orig/debian/owncloud-client-dev.install
+++ owncloud-client-2.3.3/debian/owncloud-client-dev.install
@@ -0,0 +1,2 @@
+/opt/ownCloud/ownCloud/include/owncloudsync
+usr/lib*/libowncloudsync.so
--- owncloud-client-2.3.3.orig/debian/owncloud-client-l10n.install
+++ owncloud-client-2.3.3/debian/owncloud-client-l10n.install
@@ -0,0 +1 @@
+usr/share/owncloud/i18n/*qm
--- owncloud-client-2.3.3.orig/debian/owncloud-client.install
+++ owncloud-client-2.3.3/debian/owncloud-client.install
@@ -0,0 +1,5 @@
+/usr/bin/owncloud*
+
+/opt/ownCloud/ownCloud/bin/owncloud*
+usr/share/applications/owncloud.desktop
+usr/share/icons/hicolor
--- owncloud-client-2.3.3.orig/debian/owncloud-client.lintian-overrides
+++ owncloud-client-2.3.3/debian/owncloud-client.lintian-overrides
@@ -0,0 +1,3 @@
+owncloud-client: arch-dependent-file-not-in-arch-specific-directory
+owncloud-client: binary-or-shlib-defines-rpath
+owncloud-client: possible-gpl-code-linked-with-openssl
--- owncloud-client-2.3.3.orig/debian/owncloud-doc.dirs
+++ owncloud-client-2.3.3/debian/owncloud-doc.dirs
@@ -0,0 +1 @@
+usr/share/doc
--- owncloud-client-2.3.3.orig/debian/rules
+++ owncloud-client-2.3.3/debian/rules
@@ -0,0 +1,88 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+export QT_SELECT := qt5
+export PATH := /opt/ownCloud/qt-5.6.2/lib/$(DEB_HOST_MULTIARCH)/qt5/bin:$(PATH)
+
+export DROOT=$(CURDIR)/debian/owncloud-client
+export SRCDIR=/usr/src/packages/SOURCES
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export LD_LIBRARY_PATH := /opt/ownCloud/qt-5.6.2/lib/$(DEB_HOST_MULTIARCH):$(LD_LIBRARY_PATH)
+
+
+SHELL=/bin/bash
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	# not sure, when which variables are set.
+	echo source:Version=${source:Version}
+	echo source:Upstream-Version=${source:Upstream-Version}
+	echo binary:Version=${binary:Version}
+
+	# protect against poisonous tar-balls.
+	if [ -d binary ]; then ls -la; echo; echo "A top level directory named 'binary' exists. This kills dpkg-genchangelog."; echo; echo "... removing that directory."; echo; echo; sleep 3; rm -rf binary; fi
+
+	git_defs=('-DMIRALL_VERSION_BUILD=8294'); \
+	if [ -n "" -a "" != "%nil" ]; then \
+	  git_defs=('-DMIRALL_VERSION_SUFFIX=' '-DMIRALL_VERSION_BUILD=8294'); \
+	fi; \
+	echo "include_directories(/opt/ownCloud/qt-5.6.2/include/$(DEB_HOST_MULTIARCH))" >> src/libsync/CMakeLists.txt
+	echo "include_directories(/opt/ownCloud/qt-5.6.2/include/$(DEB_HOST_MULTIARCH)/qt5)" >> src/libsync/CMakeLists.txt
+	echo "include_directories(/opt/ownCloud/qt-5.6.2/include/$(DEB_HOST_MULTIARCH)/qt5/QtCore)" >> src/libsync/CMakeLists.txt
+	# Debian 7 does not find #include <QPixmap> in qt5/QtGui/QPixmap -- this helps:
+	echo "include_directories(/opt/ownCloud/qt-5.6.2/include/$(DEB_HOST_MULTIARCH)/qt5/QtGui)" >> src/cmd/CMakeLists.txt
+	cat src/libsync/CMakeLists.txt
+
+
+
+	dh_auto_configure -- \
+		"$${git_defs[@]}" \
+		-DQT_QMAKE_EXECUTABLE=/opt/ownCloud/qt-5.6.2/bin/qmake \
+		-DCMAKE_INSTALL_PREFIX=/opt/ownCloud/ownCloud \
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc \
+		-DCMAKE_INSTALL_DATAROOTDIR:PATH=/usr/share \
+		-DDATA_INSTALL_DIR:PATH=/usr/share \
+		-DSYSCONF_INSTALL_DIR=/etc \
+		-DWITH_DOC=FALSE \
+		-DCMAKE_SKIP_BUILD_RPATH=OFF -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_INSTALL_RPATH="/opt/ownCloud/ownCloud/lib/$(DEB_HOST_MULTIARCH);/opt/ownCloud/qt-5.6.2/lib/$(DEB_HOST_MULTIARCH)" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
+		-DOEM_THEME_DIR=$(CURDIR)/ownCloud/syncclient \
+		-DCMAKE_FIND_ROOT_PATH=/opt/ownCloud/qt-5.6.2 \
+		-DQTKEYCHAIN_INCLUDE_DIR=/opt/ownCloud/qt-5.6.2/include/qt5keychain \
+		-DQTKEYCHAIN_LIBRARY=/opt/ownCloud/qt-5.6.2/lib/$(DEB_HOST_MULTIARCH)/libqt5keychain.so \
+		-DBUILD_SHELL_INTEGRATION=OFF
+	
+	# workaround for https://github.com/owncloud/client/issues/5958
+	find . -name link.txt | xargs sed -i -e 's@-Wl,-rpath,/@-Wl,--disable-new-dtags -Wl,-rpath,/@'
+
+override_dh_auto_install:
+	dh_auto_install -Xdebian
+	# https://github.com/owncloud/client/issues/4107
+	install -m 0755 -D $(SRCDIR)/100-sync-inotify.conf $(DROOT)/etc/sysctl.d/100-owncloud-inotify.conf
+
+	# install symlinks to /usr/bin
+	install -m 0644 -d $(CURDIR)/usr/bin/
+	ln -s /opt/ownCloud/ownCloud/bin/owncloud $(CURDIR)/usr/bin/owncloud
+	ln -s /opt/ownCloud/ownCloud/bin/owncloudcmd $(CURDIR)/usr/bin/owncloudcmd
+	
+	# assert https://github.com/owncloud/client/issues/5958
+	objdump -x $(CURDIR)/debian/tmp//opt/ownCloud/ownCloud/bin/owncloud | grep RPATH | grep /opt/ownCloud || (echo "RPATH regression"; exit 1)
+	
+	# https://github.com/owncloud/client/issues/2153
+	find $(CURDIR) -name \*.1 | grep man/man1 | tee | xargs rm -f
+
+
+override_dh_strip:
+	dh_strip --dbg-package=owncloud-client-dbg
+
+override_dh_shlibdeps:
+	dh_shlibdeps -O--parallel -l"/opt/ownCloud/ownCloud/lib/$(DEB_HOST_MULTIARCH):/opt/ownCloud/qt-5.6.2/lib/$(DEB_HOST_MULTIARCH)"
--- owncloud-client-2.3.3.orig/debian/source.lintian-overrides
+++ owncloud-client-2.3.3/debian/source.lintian-overrides
@@ -0,0 +1,7 @@
+# needed for Debian 8.0 to finsh a build in obs.
+# FIXME: all that should be warnings in obs, as they are in s2 and local builds.
+owncloud-client source: not-binnmuable-all-depends-any
+# owncloud-client: binary-or-shlib-defines-rpath usr/bin/owncloud /usr/lib/x86_64-linux-gnu/owncloud
+owncloud-client: binary-or-shlib-defines-rpath
+# owncloud-client: arch-dependent-file-not-in-arch-specific-directory usr/bin/owncloud
+owncloud-client: arch-dependent-file-not-in-arch-specific-directory
--- owncloud-client-2.3.3.orig/doc/CMakeLists.txt
+++ owncloud-client-2.3.3/doc/CMakeLists.txt
@@ -12,10 +12,13 @@
     # assets
     set(LATEX_LOGO          "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")
 
-    install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
+    set(APPLICATION_DOC_DIR "${CMAKE_INSTALL_DOCDIR}/${PACKAGE}")
+    install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
+    install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
+    install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
+
     install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR} OPTIONAL)
-    install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
-    install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
+
 
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
 
--- owncloud-client-2.3.3.orig/shell_integration/CMakeLists.txt
+++ owncloud-client-2.3.3/shell_integration/CMakeLists.txt
@@ -1,17 +1,23 @@
 if (APPLE)
   add_subdirectory(MacOSX)
 endif()
-add_subdirectory(icons)
+if(BUILD_SHELL_INTEGRATION_ICONS)
+  add_subdirectory(icons)
+endif()
 
 if( UNIX AND NOT APPLE )
-  add_subdirectory(nautilus)
+  if(BUILD_SHELL_INTEGRATION_NAUTILUS)
+    add_subdirectory(nautilus)
+  endif()
 
-  find_package(ECM 1.2.0 NO_MODULE QUIET)
-  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-  find_package(KF5 "5.16" COMPONENTS KIO)
-  if(KF5_FOUND)
-    add_subdirectory(dolphin)
-  else()
-    message("Dolphin plugin disabled: KDE Frameworks 5.16 not found")
+  if(BUILD_SHELL_INTEGRATION_DOLPHIN)
+    find_package(ECM 1.2.0 NO_MODULE QUIET)
+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+    find_package(KF5 "5.16" COMPONENTS KIO)
+    if(KF5_FOUND)
+        add_subdirectory(dolphin)
+    else()
+        message("Dolphin plugin disabled: KDE Frameworks 5.16 not found")
+    endif()
   endif()
 endif()
--- owncloud-client-2.3.3.orig/src/cmd/CMakeLists.txt
+++ owncloud-client-2.3.3/src/cmd/CMakeLists.txt
@@ -26,7 +26,7 @@
 	set_target_properties(${cmd_NAME} PROPERTIES
 	        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
         set_target_properties(${cmd_NAME} PROPERTIES
-		INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+		INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
 
 	target_link_libraries(${cmd_NAME} ${synclib_NAME})
 endif()
--- owncloud-client-2.3.3.orig/src/cmd/cmd.cpp
+++ owncloud-client-2.3.3/src/cmd/cmd.cpp
@@ -177,8 +177,7 @@
 }
 
 void showVersion() {
-    const char *binaryName = APPLICATION_EXECUTABLE "cmd";
-    std::cout << binaryName << " version " << qPrintable(Theme::instance()->version()) << std::endl;
+    std::cout << qPrintable(Utility::executableVersionOutput(Theme::instance()));
     exit(0);
 }
 
--- owncloud-client-2.3.3.orig/src/gui/CMakeLists.txt
+++ owncloud-client-2.3.3/src/gui/CMakeLists.txt
@@ -5,7 +5,7 @@
 
 #TODO Move resources files
 qt_add_resources(MIRALL_RC_SRC ../../client.qrc)
-if ( IS_DIRECTORY ${OEM_THEME_DIR} )
+if (EXISTS "${OEM_THEME_DIR}/theme.qrc")
     qt_add_resources(MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc)
     set(theme_dir ${OEM_THEME_DIR}/theme)
 else()
@@ -293,7 +293,7 @@
 )
 # Only relevant for Linux? On OS X it by default properly checks in the bundle directory next to the exe
 set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
-	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
 
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
--- owncloud-client-2.3.3.orig/src/gui/application.cpp
+++ owncloud-client-2.3.3/src/gui/application.cpp
@@ -506,20 +506,7 @@
 
 void Application::showVersion()
 {
-    QString helpText;
-    QTextStream stream(&helpText);
-    stream << _theme->appName().toLatin1().constData()
-           << QLatin1String(" version ")
-           << _theme->version().toLatin1().constData() << endl;
-#ifdef GIT_SHA1
-    stream << "Git revision " << GIT_SHA1 << endl;
-#endif
-    stream << "Using Qt " << qVersion() << ", built against Qt " << QT_VERSION_STR << endl;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    stream << "Using '" << QSslSocket::sslLibraryVersionString() << "'" << endl;
-#endif
-
-    displayHelpText(helpText);
+    displayHelpText(Utility::executableVersionOutput(_theme));
 }
 
 void Application::showHint(std::string errorHint)
--- owncloud-client-2.3.3.orig/src/libsync/CMakeLists.txt
+++ owncloud-client-2.3.3/src/libsync/CMakeLists.txt
@@ -148,7 +148,7 @@
 	RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
 )
 set_target_properties( ${synclib_NAME} PROPERTIES
-	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
 
 target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
 
--- owncloud-client-2.3.3.orig/src/libsync/utility.cpp
+++ owncloud-client-2.3.3/src/libsync/utility.cpp
@@ -18,6 +18,7 @@
 
 #include "version.h"
 #include "configfile.h"
+#include "theme.h"
 
 // Note:  This file must compile without QtGui
 #include <QCoreApplication>
@@ -31,6 +32,7 @@
 #include <QObject>
 #include <QThread>
 #include <QDateTime>
+#include <QSslSocket>
 #include <QSysInfo>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 #include <QTextDocument>
@@ -484,6 +486,24 @@
     return re;
 }
 
+QString Utility::executableVersionOutput(Theme* theme)
+{
+    QString helpText;
+    QTextStream stream(&helpText);
+    stream << theme->appName().toLatin1().constData()
+           << QLatin1String(" version ")
+           << theme->version().toLatin1().constData() << endl;
+#ifdef GIT_SHA1
+    stream << "Git revision " << GIT_SHA1 << endl;
+#endif
+    stream << "Using Qt " << qVersion() << ", built against Qt " << QT_VERSION_STR << endl;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    stream << "Using '" << QSslSocket::sslLibraryVersionString() << "'" << endl;
+#endif
+
+    return helpText;
+}
+
 QString Utility::timeAgoInWords(const QDateTime& dt, const QDateTime& from)
 {
     QDateTime now = QDateTime::currentDateTimeUtc();
--- owncloud-client-2.3.3.orig/src/libsync/utility.h
+++ owncloud-client-2.3.3/src/libsync/utility.h
@@ -29,6 +29,8 @@
 
 namespace OCC {
 
+class Theme;
+
 /** \addtogroup libsync
  *  @{
  */
@@ -123,6 +125,9 @@
     // For Mac and Windows, it returns QString()
     OWNCLOUDSYNC_EXPORT QByteArray versionOfInstalledBinary(const QString& command = QString() );
 
+    // Shared `--version` output for gui and cmd
+    OWNCLOUDSYNC_EXPORT QString executableVersionOutput(Theme* theme);
+
     OWNCLOUDSYNC_EXPORT QString fileNameForGuiUse(const QString& fName);
 
     /**
