From 3748e80deb5036aa21dfad6024c1dd3b41039ba1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Jul 2015 21:43:38 +0000 Subject: [PATCH 1/8] SVN_SILENT made messages (.desktop file) --- src/dolphinpart.desktop | 4 ++++ src/org.kde.dolphin.desktop | 2 ++ src/settings/kcm/kcmdolphingeneral.desktop | 5 +++++ src/settings/kcm/kcmdolphinnavigation.desktop | 5 +++++ src/settings/kcm/kcmdolphinservices.desktop | 4 ++++ src/settings/kcm/kcmdolphinviewmodes.desktop | 5 +++++ .../versioncontrol/fileviewversioncontrolplugin.desktop | 1 + 7 files changed, 26 insertions(+) diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 8c78d6e0be..64c01f13b5 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -21,6 +21,7 @@ Name[nn]=Dolphin-vising Name[pl]=Widok Dolphina Name[pt]=Área do Dolphin Name[pt_BR]=Visualização do Dolphin +Name[ru]=Представление Dolphin Name[se]=Dolphinčájeheapmi Name[sk]=Dolphin pohľad Name[sl]=Dolphin - pogled @@ -69,6 +70,7 @@ Name[nn]=Ikon Name[pl]=Ikony Name[pt]=Ícones Name[pt_BR]=Ícones +Name[ru]=Значки Name[se]=Govažat Name[sk]=Ikony Name[sl]=Ikone @@ -106,6 +108,7 @@ Name[nl]=Compact Name[pl]=Kompaktowy Name[pt]=Compacta Name[pt_BR]=Compacto +Name[ru]=Столбцы Name[sk]=Kompaktný Name[sl]=Strnjeno Name[sr]=Сажето @@ -144,6 +147,7 @@ Name[nn]=Detaljar Name[pl]=Szczegóły Name[pt]=Detalhes Name[pt_BR]=Detalhes +Name[ru]=Таблица Name[sk]=Podrobnosti Name[sl]=Podrobnosti Name[sr]=Детаљи diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index d7e905507c..0d25c1750c 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -20,6 +20,7 @@ Name[nn]=Dolphin Name[pl]=Dolphin Name[pt]=Dolphin Name[pt_BR]=Dolphin +Name[ru]=Dolphin Name[se]=Dolphin Name[sk]=Dolphin Name[sl]=Dolphin @@ -59,6 +60,7 @@ GenericName[nn]=Filhandsamar GenericName[pl]=Zarządzanie plikami GenericName[pt]=Gestor de Ficheiros GenericName[pt_BR]=Gerenciador de arquivos +GenericName[ru]=Диспетчер файлов GenericName[se]=Fiilagieđahalli GenericName[sk]=Správca súborov GenericName[sl]=Upravljalnik datotek diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index cb98aed835..b660399dc4 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -19,6 +19,7 @@ Name[nn]=Generelt for Dolphin Name[pl]=Ustawienia Dolphina Name[pt]=Geral do Dolphin Name[pt_BR]=Geral do Dolphin +Name[ru]=Основные параметры Dolphin Name[se]=Dolphinoppalaččat Name[sk]=Všeobecný Dolphin Name[sl]=Dolphin - splošno @@ -52,6 +53,7 @@ Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren. Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina. Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin. Comment[pt_BR]=Este serviço permite configurar as opções gerais do Dolphin. +Comment[ru]=Эта служба позволяет настраивать основные параметры Dolphin Comment[sk]=Táto služba umožňuje všeobecné nastavenie Dolphinu. Comment[sl]=Ta storitev omogoča spreminjanje splošnih nastavitev programa Dolphin. Comment[sr]=Овај сервис омогућава подешавање општих Делфинових поставки. @@ -97,6 +99,7 @@ Name[nn]=Generelt Name[pl]=Ogólne Name[pt]=Geral Name[pt_BR]=Geral +Name[ru]=Основное Name[sk]=Všeobecné Name[sl]=Splošno Name[sr]=Опште @@ -129,6 +132,7 @@ Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[pl]=Ustawienia ogólne zarządzania plikami Comment[pt]=Configurar as definições gerais do gestor de ficheiros Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos +Comment[ru]=Настройка диспетчера файлов Comment[sk]=Všeobecné nastavenie správcu súborov Comment[sl]=Splošne nastavitve upravljalnika datotek Comment[sr]=Подешавање општих поставки менаџера фајлова @@ -161,6 +165,7 @@ X-KDE-Keywords[nn]=filhandsamar X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos +X-KDE-Keywords[ru]=диспетчер файлов X-KDE-Keywords[sk]=správca súborov X-KDE-Keywords[sl]=upravljalnik datotek X-KDE-Keywords[sr]=file manager,менаџер фајлова diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index b742f2f873..fab72ef572 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -19,6 +19,7 @@ Name[nn]=Navigasjon i Dolphin Name[pl]=Nawigacja Dolphina Name[pt]=Navegação do Dolphin Name[pt_BR]=Navegação do Dolphin +Name[ru]=Навигация в Dolphin Name[se]=Dolphinnavigašuvdna Name[sk]=Navigácia Dolphinu Name[sl]=Dolphin - krmarjenje @@ -52,6 +53,7 @@ Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren. Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie. Comment[pt]=Este serviço permite a configuração da navegação do Dolphin. Comment[pt_BR]=Este serviço permite configurar a navegação do Dolphin. +Comment[ru]=Эта служба позволяет настраивать навигацию в Dolphin Comment[sk]=Táto služba umožňuje nastavenie navigácie v Dolphine. Comment[sl]=Ta storitev omogoča spreminjanje nastavitev krmarjenja programa Dolphin. Comment[sr]=Овај сервис омогућава подешавање навигације у Делфину. @@ -96,6 +98,7 @@ Name[nn]=Navigasjon Name[pl]=Nawigacja Name[pt]=Navegação Name[pt_BR]=Navegação +Name[ru]=Навигация Name[se]=Navigašuvdna Name[sk]=Navigácia Name[sl]=Krmarjenje @@ -130,6 +133,7 @@ Comment[nn]=Set opp navigasjonen i filhandsamaren Comment[pl]=Ustawienia nawigacji w zarządzaniu plikami Comment[pt]=Configurar a navegação do gestor de ficheiros Comment[pt_BR]=Configura a navegação do gerenciador de arquivos +Comment[ru]=Настройка навигации в диспетчере файлов Comment[se]=Heivet fiilagieđahallannavigašuvdna Comment[sk]=Nastavenie navigácie správcu súborov Comment[sl]=Nastavitve krmarjenja v upravljalniku datotek @@ -163,6 +167,7 @@ X-KDE-Keywords[nn]=filhandsamar X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos +X-KDE-Keywords[ru]=диспетчер файлов X-KDE-Keywords[sk]=správca súborov X-KDE-Keywords[sl]=upravljalnik datotek X-KDE-Keywords[sr]=file manager,менаџер фајлова diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index fc685206bf..e70eeba2e1 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -18,6 +18,7 @@ Name[nl]=Dolphin-services Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin Name[pt_BR]=Serviços do Dolphin +Name[ru]=Действия Dolphin Name[sk]=Služby Dolphinu Name[sl]=Dolphin - storitve Name[sr]=Делфинови сервиси @@ -61,6 +62,7 @@ Name[nl]=Services Name[pl]=Usługi Name[pt]=Serviços Name[pt_BR]=Serviços +Name[ru]=Действия Name[sk]=Služby Name[sl]=Storitve Name[sr]=Сервиси @@ -94,6 +96,7 @@ Comment[nn]=Set opp tenester i filhandsamaren Comment[pl]=Ustawienia usług zarządzania plikami Comment[pt]=Configurar os serviços do gestor de ficheiros Comment[pt_BR]=Configura os serviços do gerenciador de arquivos +Comment[ru]=Настройка действий в диспетчере файлов Comment[sk]=Nastavenie služieb správcu súborov Comment[sl]=Nastavitve storitev upravljalnika datotek Comment[sr]=Подешавање сервиса менаџера фајлова @@ -126,6 +129,7 @@ X-KDE-Keywords[nn]=filhandsamar X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos +X-KDE-Keywords[ru]=диспетчер файлов X-KDE-Keywords[sk]=správca súborov X-KDE-Keywords[sl]=upravljalnik datotek X-KDE-Keywords[sr]=file manager,менаџер фајлова diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 3a40e81bb2..3bba12e1e9 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -19,6 +19,7 @@ Name[nn]=Dolphin-visingar Name[pl]=Tryby widoku Dolphina Name[pt]=Modos de Visualização do Dolphin Name[pt_BR]=Modos de exibição do Dolphin +Name[ru]=Режимы просмотра папок в Dolphin Name[se]=Dolphin čájehanmodusat Name[sk]=Režimy zobrazenia Dolphinu Name[sl]=Dolphin - načini prikaza @@ -52,6 +53,7 @@ Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren. Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina. Comment[pt]=Este serviço permite a configuração dos modos de visualização do Dolphin. Comment[pt_BR]=Este serviço permite configurar os modos de exibição do Dolphin. +Comment[ru]=Эта служба позволяет настраивать режимы просмотра папок в Dolphin Comment[sk]=Táto služba umožňuje nastavenie režimov zobrazenia Dolphinu. Comment[sl]=Ta storitev omogoča spreminjanje nastavitev načinov prikaza programa Dolphin. Comment[sr]=Овај сервис омогућава подешавање Делфинових режима приказа. @@ -96,6 +98,7 @@ Name[nn]=Visingsmodusar Name[pl]=Tryby widoku Name[pt]=Modos de Visualização Name[pt_BR]=Modos de exibição +Name[ru]=Режимы просмотра Name[se]=Čájehanmodusat Name[sk]=Režimy zobrazenia Name[sl]=Načini prikaza @@ -130,6 +133,7 @@ Comment[nn]=Set opp visingsmodusane i filhandsamaren Comment[pl]=Ustawienia trybów widoku zarządzania plikami Comment[pt]=Configurar os modos de visualização do gestor de ficheiros Comment[pt_BR]=Configura os modos de exibição do gerenciador de arquivos +Comment[ru]=Настройка режимов просмотра папок в диспетчере файлов Comment[se]=Heivet fiilagieđahalli čájehanmodusat Comment[sk]=Nastavenie režimov zobrazenia správcu súborov Comment[sl]=Nastavitve načinov prikaza upravljalnika datotek @@ -163,6 +167,7 @@ X-KDE-Keywords[nn]=filhandsamar X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos +X-KDE-Keywords[ru]=диспетчер файлов X-KDE-Keywords[sk]=správca súborov X-KDE-Keywords[sl]=upravljalnik datotek X-KDE-Keywords[sr]=file manager,менаџер фајлова diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 99a933ec9d..509fc2cc8b 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -22,6 +22,7 @@ Comment[nn]=Versjonskontroll-tillegg for filvisingar Comment[pl]=Wtyczka systemu zarządzania wersjami dla widoku plików Comment[pt]='Plugin' de Controlo de Versões para as Áreas de Ficheiros Comment[pt_BR]=Extensão de controle de versões para as visualizações de arquivos +Comment[ru]=Расширение для управления версиями для компонента просмотра папки Comment[sk]=Modul pre správu verzií v súborovom zobrazení Comment[sl]=Vstavek za delo s sistemi za nadzor različic Comment[sr]=Прикључак управљања верзијама за фајл приказе From c7b19c587f85289979894bd58cff3f669bb3c7a8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 27 Jul 2015 11:01:31 +0000 Subject: [PATCH 2/8] SVN_SILENT made messages (after extraction) --- src/dolphin.appdata.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/dolphin.appdata.xml b/src/dolphin.appdata.xml index d02c0d07cb..64a1edf764 100644 --- a/src/dolphin.appdata.xml +++ b/src/dolphin.appdata.xml @@ -30,6 +30,7 @@ Dolphin Dolphin Dolphin + Dolphin Dolphin Dolphin Делфин @@ -69,6 +70,7 @@ Gestor de Ficheiros Gerenciador de arquivos Gestionar de fișiere + Диспетчер файлов Správca súborov Upravljalnik datotek Менаџер фајлова @@ -105,6 +107,7 @@

Dolphin jest lekkim programem do zarządzania plikami. Został on opracowany mając na uwadze łatwość i prostotę obsługi, zapewniając jednocześnie elastyczność i możliwość dostosowania. Oznacza to, że można urządzić zarządzanie plikami w dokładnie taki sposób w jaki jest to pożądane.

O Dolphin é um gestor de ficheiros leve. Foi desenhado com a facilidade de uso e simplicidade em mente, permitindo à mesma a flexibilidade e personalização. Isto significa que poderá fazer a sua gestão de ficheiros exactamente da forma que deseja.

Dolphin é um gerenciador de arquivos leve e fácil de usar. Foi projetado para ser simples e ao mesmo tempo manter a flexibilidade e personalização. Isso significa que você poderá gerenciar seus arquivos da forma que desejar.

+

Dolphin — это упрощённый диспетчер файлов. Он создавался как лёгкий в использовании, но в то же время является гибким и расширяемым.

Dolphin je odľahčený správca súborov. Bol navrhnutý na jednoduché použitie a jednoduchosť, ale s možnosťami flexibility a prispôsobenia. To znamená, že môžete vykonávať správu súborov presne tak, ako chcete.

Dolphin je enostaven upravljalnik datotek. Bil je zasnovan kot enostaven in preprost, vseeno pa ostaja prilagodljiv. To pomeni, da lahko upravljanje datotek izvajate točno tako kot želite.

Делфин је лагани менаџер фајлова. Пројектован је да буде лак за употребу и једноставан, а да ипак омогућава флексибилност и прилагођавање. То значи да ће моћи да баратате фајловима тачно онако како бисте желели.

@@ -144,6 +147,7 @@

Funcionalidades:

Funcionalidades:

Caracteristici:

+

Возможности:

Funkcie:

Zmožnosti:

Могућности:

From 52136255d86cfdf4bcfcd865bfa14cdd481b3a77 Mon Sep 17 00:00:00 2001 From: Christian Butcher Date: Mon, 27 Jul 2015 22:29:00 +0200 Subject: [PATCH 3/8] Change the Dolphin places icons: * folder-txt => folder-text * folder-video => folder-videos * folder-image => folder-images Thanks to andreas_k and Christian Butcher! BUG: 347257 FIXED-IN: 15.08.0 --- src/panels/places/placesitemmodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index f3d3449634..3143b74101 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -917,16 +917,16 @@ void PlacesItemModel::createSystemBookmarks() "view-calendar-month", I18N_NOOP2("KFile System Bookmarks", "Last Month"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/documents"), - "folder-txt", + "folder-text", I18N_NOOP2("KFile System Bookmarks", "Documents"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/images"), - "folder-image", + "folder-images", I18N_NOOP2("KFile System Bookmarks", "Images"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/audio"), "folder-sound", I18N_NOOP2("KFile System Bookmarks", "Audio Files"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/videos"), - "folder-video", + "folder-videos", I18N_NOOP2("KFile System Bookmarks", "Videos"))); } From 7d1a054267a7fa1b2feed68556e7dc401f34310e Mon Sep 17 00:00:00 2001 From: Ragnar Thomsen Date: Wed, 29 Jul 2015 22:54:54 +0200 Subject: [PATCH 4/8] Enable automatic update of version number Use CMake variables autoupdated by release script. Dolphin version is automatically updated to KDE Applications version. --- CMakeLists.txt | 14 +++++++++++--- src/main.cpp | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3575db5da2..6dc60a5d8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 2.8.12) project(Dolphin) -set(DOLPHIN_VERSION "14.12.95") +# KDE Application Version, managed by release script +set (KDE_APPLICATIONS_VERSION_MAJOR "15") +set (KDE_APPLICATIONS_VERSION_MINOR "07") +set (KDE_APPLICATIONS_VERSION_MICRO "80") +set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") set(KF5_MIN_VERSION "5.7.0") @@ -21,13 +25,17 @@ include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings) -ecm_setup_version(${DOLPHIN_VERSION} VARIABLE_PREFIX DOLPHINVCS +ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h" +) + +ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINVCS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake" SOVERSION 5 ) -ecm_setup_version(${DOLPHIN_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE +ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE SOVERSION 5 ) diff --git a/src/main.cpp b/src/main.cpp index ec6833681b..b4ca2c6af7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,6 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ +#include "dolphin_version.h" #include "dolphinmainwindow.h" #include "dolphin_generalsettings.h" #include "dbusinterface.h" @@ -44,7 +45,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc")); migrate.migrate(); - KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95", + KAboutData aboutData("dolphin", i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING), i18nc("@title", "File Manager"), KAboutLicense::GPL, i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta")); From 8797d704b6e34f96abb31775dafb49f9227e6769 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Mon, 27 Jul 2015 22:04:59 +0200 Subject: [PATCH 5/8] Remove unused KBookmarkManager::bookmarksChanged signal-slot connection, because we don't use KBoomark's D-Bus signaling anymore. REVIEW: 124497 --- src/panels/places/placesitemmodel.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index 3143b74101..013b99731e 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -101,8 +101,6 @@ PlacesItemModel::PlacesItemModel(QObject* parent) : connect(m_bookmarkManager, &KBookmarkManager::changed, m_updateBookmarksTimer, static_cast(&QTimer::start)); - connect(m_bookmarkManager, &KBookmarkManager::bookmarksChanged, - m_updateBookmarksTimer, static_cast(&QTimer::start)); } PlacesItemModel::~PlacesItemModel() From b5cb4ce9187038bf7663d0f108e3aced67b0fa60 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 5 Aug 2015 21:43:10 +0200 Subject: [PATCH 6/8] GIT_SILENT Upgrade KDE Applications version to 15.07.90. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6dc60a5d8f..28b8cd9a81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(Dolphin) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") set (KDE_APPLICATIONS_VERSION_MINOR "07") -set (KDE_APPLICATIONS_VERSION_MICRO "80") +set (KDE_APPLICATIONS_VERSION_MICRO "90") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") From 1eddb9a4cbed36a0879dfba513572e7340b1be63 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 12 Aug 2015 01:11:34 +0200 Subject: [PATCH 7/8] GIT_SILENT Upgrade KDE Applications version to 15.08.0. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28b8cd9a81..1db40d13bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ project(Dolphin) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") -set (KDE_APPLICATIONS_VERSION_MINOR "07") -set (KDE_APPLICATIONS_VERSION_MICRO "90") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "0") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") From 31f0acc72653972845f83abd60eaffde511801f1 Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Wed, 19 Aug 2015 10:59:46 +0200 Subject: [PATCH 8/8] do not install namelink for private library there are no headers being installed for the private library so it cannot be linked anyway, so we can also skip the namelink creation (.so symlink) REVIEW: 124812 --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 498e7c596e..2a5e5a688f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -168,7 +168,7 @@ set_target_properties(dolphinprivate PROPERTIES SOVERSION ${DOLPHINPRIVATE_SOVERSION} ) -install(TARGETS dolphinprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS dolphinprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) ##########################################