GIT_SILENT Upgrade release service version to 21.03.80.

SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2026-07-01 15:51:18 -07:00 · 2021-03-13 21:39:35 +01:00 · 2021-03-13 06:42:19 +01:00 · 2021-03-13 02:36:42 +01:00 · 2021-03-13 00:56:36 +01:00 · 2021-02-25 00:41:46 +01:00
10 changed files with 15 additions and 17 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 3.0)

 # KDE Application Version, managed by release script
-set (RELEASE_SERVICE_VERSION_MAJOR "20")
-set (RELEASE_SERVICE_VERSION_MINOR "12")
-set (RELEASE_SERVICE_VERSION_MICRO "3")
+set (RELEASE_SERVICE_VERSION_MAJOR "21")
+set (RELEASE_SERVICE_VERSION_MINOR "03")
+set (RELEASE_SERVICE_VERSION_MICRO "80")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

 project(krfb VERSION ${RELEASE_SERVICE_VERSION})

-set(QT_MIN_VERSION 5.10.0)
+set(QT_MIN_VERSION 5.12.0)
 set(KF5_MIN_VERSION 5.68.0)

 find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,2 +1,2 @@
 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR krfb)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR krfb)
--- a/events/x11/CMakeLists.txt
+++ b/events/x11/CMakeLists.txt
@@ -15,4 +15,4 @@ target_link_libraries (krfb_events_x11
                       krfbprivate
 )

-install (TARGETS krfb_events_x11 DESTINATION ${PLUGIN_INSTALL_DIR}/krfb)
+install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb)
--- a/events/xdp/CMakeLists.txt
+++ b/events/xdp/CMakeLists.txt
@@ -23,5 +23,5 @@ target_link_libraries (krfb_events_xdp
 )

 install (TARGETS krfb_events_xdp
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
 )
--- a/framebuffers/pipewire/CMakeLists.txt
+++ b/framebuffers/pipewire/CMakeLists.txt
@@ -49,5 +49,5 @@ target_link_libraries (krfb_framebuffer_pw
 )

 install (TARGETS krfb_framebuffer_pw
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
 )
--- a/framebuffers/qt/CMakeLists.txt
+++ b/framebuffers/qt/CMakeLists.txt
@@ -28,5 +28,5 @@ target_link_libraries (krfb_framebuffer_qt
 )

 install (TARGETS krfb_framebuffer_qt
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
 )
--- a/framebuffers/xcb/CMakeLists.txt
+++ b/framebuffers/xcb/CMakeLists.txt
@@ -32,5 +32,5 @@ target_link_libraries (krfb_framebuffer_xcb
 )

 install (TARGETS krfb_framebuffer_xcb
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
 )
--- a/krfb/CMakeLists.txt
+++ b/krfb/CMakeLists.txt
@@ -36,14 +36,14 @@ set_target_properties (krfbprivate PROPERTIES
 )

 install (TARGETS krfbprivate
-         ${INSTALL_TARGETS_DEFAULT_ARGS}
+         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
         LIBRARY NAMELINK_SKIP
 )

 install (FILES
         krfb-framebuffer.desktop
         krfb-events.desktop
-         DESTINATION ${SERVICETYPES_INSTALL_DIR}
+         DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}
 )

 #####################################
@@ -120,13 +120,13 @@ if (X11_XTest_FOUND)
 endif (X11_XTest_FOUND)

 install (TARGETS krfb
-         ${INSTALL_TARGETS_DEFAULT_ARGS}
+         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )

 ########### install files ###############

 install (PROGRAMS org.kde.krfb.desktop
-         DESTINATION ${XDG_APPS_INSTALL_DIR}
+         DESTINATION ${KDE_INSTALL_APPDIR}
 )

 install(FILES org.kde.krfb.appdata.xml
@@ -134,6 +134,6 @@ install(FILES org.kde.krfb.appdata.xml
 )

 install (FILES krfb.notifyrc
-         DESTINATION ${DATA_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_DATADIR}/krfb
 )

--- a/krfb/org.kde.krfb.appdata.xml
+++ b/krfb/org.kde.krfb.appdata.xml
@@ -58,7 +58,6 @@
  <summary xml:lang="pl">Udostępnij swój pulpit innemu komputerowi przez VNC</summary>
  <summary xml:lang="pt">Partilhar o seu ecrã com outro computador por VNC</summary>
  <summary xml:lang="pt-BR">Compartilhar sua área de trabalho com outro computador via VNC</summary>
-  <summary xml:lang="sk">Zdieľajte svoju plochu s iným počítačom cez VNC</summary>
  <summary xml:lang="sl">Deli namizje z drugim računalnikom prek VNC</summary>
  <summary xml:lang="sv">Dela ditt skrivbord med en annan dator via VNC</summary>
  <summary xml:lang="uk">Надайте вашу стільницю у спільне користування з іншим комп'ютером за допомогою VNC</summary>
--- a/krfb/org.kde.krfb.desktop
+++ b/krfb/org.kde.krfb.desktop
@@ -93,7 +93,6 @@ GenericName[nn]=Skrivebordsdeling (VNC)
 GenericName[pl]=Współdzielenie pulpitu (VNC)
 GenericName[pt]=Partilha do Ecrã (VNC)
 GenericName[pt_BR]=Compartilhamento de ambiente de trabalho (VNC)
-GenericName[sk]=Zdieľanie pracovnej plochy (VNC)
 GenericName[sl]=Souporaba namizja (VNC)
 GenericName[sv]=Skrivbordsdelning (VNC)
 GenericName[uk]=Спільні стільниці (VNC)
Author	SHA1	Message	Date
Albert Astals Cid	e3cb606713	GIT_SILENT Upgrade release service version to 21.03.80.	2021-03-13 21:39:35 +01:00
l10n daemon script	d533b76f9b	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2021-03-13 06:42:19 +01:00
l10n daemon script	34a0e0c361	GIT_SILENT made messages (after extraction)	2021-03-13 02:36:42 +01:00
Albert Astals Cid	e1fdba3014	Merge remote-tracking branch 'origin/release/20.12'	2021-03-13 00:56:36 +01:00
Heiko Becker	73500f837e	GIT_SILENT Update Appstream for new release (cherry picked from commit `f9a062ffa9`)	2021-02-25 00:41:46 +01:00
Laurent Montel	15068b250c	We depend against kf5.68 => depend against qt 5.12	2021-02-08 07:06:20 +01:00
Laurent Montel	326d58a439	GIT_SILENT: don't use deprecated cmake variable	2021-02-08 07:05:59 +01:00
Heiko Becker	3625b0cee3	GIT_SILENT Update Appstream for new release (cherry picked from commit `1a7f3a8517`)	2021-01-29 21:24:50 +01:00
l10n daemon script	938f98cef5	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2021-01-24 06:57:01 +01:00
Aleix Pol	93eb2d78d4	Merge branch 'release/20.12'	2021-01-22 02:00:03 +01:00
l10n daemon script	2c184a22bf	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2021-01-18 07:08:20 +01:00
l10n daemon script	bb35068a1d	GIT_SILENT made messages (after extraction)	2021-01-18 02:43:31 +01:00
Christoph Feck	f03b829814	GIT_SILENT Update Appstream for new release (cherry picked from commit `706d4853b2`)	2021-01-02 15:22:45 +01:00
l10n daemon script	74070d3baa	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2020-12-07 06:12:37 +01:00
l10n daemon script	cceab8c12a	GIT_SILENT made messages (after extraction)	2020-12-07 02:28:32 +01:00
Christoph Feck	513b717fac	GIT_SILENT Update Appstream for new release (cherry picked from commit `b5a328b905`)	2020-12-02 23:35:55 +01:00
l10n daemon script	dcc1bb2de5	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2020-11-18 06:35:41 +01:00
l10n daemon script	14aa98ccca	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2020-11-12 06:23:56 +01:00
l10n daemon script	717607b1c6	GIT_SILENT made messages (after extraction)	2020-11-12 02:27:33 +01:00
Albert Astals Cid	e34043d514	GIT_SILENT Upgrade release service version to 21.03.70.	2020-11-08 18:56:33 +01:00