From: Wolfgang Bauer <wbauer@tmo.at>
Date: Wed, 7 Aug 2019 16:11:51 +0000 (+0200)
Subject: Merge branch 'Applications/19.08'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e39b7e8f5a91ccfabaf5e47a46960c2e091ee8b4?hp=-c

Merge branch 'Applications/19.08'
---

e39b7e8f5a91ccfabaf5e47a46960c2e091ee8b4
diff --combined CMakeLists.txt
index a76dda9ce,838ca1445..8f2a118ce
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -2,8 -2,8 +2,8 @@@ cmake_minimum_required(VERSION 3.0
  
  # KDE Application Version, managed by release script
  set (KDE_APPLICATIONS_VERSION_MAJOR "19")
 -set (KDE_APPLICATIONS_VERSION_MINOR "07")
 -set (KDE_APPLICATIONS_VERSION_MICRO "90")
 +set (KDE_APPLICATIONS_VERSION_MINOR "11")
 +set (KDE_APPLICATIONS_VERSION_MICRO "70")
  set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
  project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
  
@@@ -150,7 -150,7 +150,7 @@@ configure_file(org.kde.dolphin.FileMana
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service
          DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
  
- if (ECM_VERSION VERSION_GREATER_EQUAL "5.59.0")
+ if (NOT ECM_VERSION VERSION_LESS "5.59.0")
      install(FILES dolphin.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
  else()
      install(FILES dolphin.categories  DESTINATION ${KDE_INSTALL_CONFDIR})