From 81ee27d5e832d88486ff76cd239ce00d2e9e5811 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 2 Jan 2017 01:37:10 +0100 Subject: [PATCH] Adding upstream version 0.11.1. Signed-off-by: Alf Gaida --- .gitignore | 2 -- CHANGELOG | 11 ++++++- CMakeLists.txt | 33 ++++++++----------- .../lxqt-config-notificationd_da.desktop | 7 ++-- .../lxqt-config-notificationd_da_DK.desktop | 4 --- .../lxqt-config-notificationd_fr.desktop | 4 +++ .../lxqt-config-notificationd_fr_FR.desktop | 3 -- 7 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 .gitignore delete mode 100644 config/translations/lxqt-config-notificationd_da_DK.desktop create mode 100644 config/translations/lxqt-config-notificationd_fr.desktop delete mode 100644 config/translations/lxqt-config-notificationd_fr_FR.desktop diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 290b958..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -*/translations/lxqt-notificationd diff --git a/CHANGELOG b/CHANGELOG index d396fda..52e9afc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,16 @@ -lxqt-notificationd-0.11.0 / 2016-09-24 +lxqt-notificationd-0.11.1 / 2017-01-01 ====================================== + * Updated da translation. Removed da_DK + * Update and rename French .desktop file + * Make CMakeList.txt more uniform. + * Remove cpack (#53) + +0.11.0 / 2016-09-24 +=================== + + * Release 0.11.0: Add changelog * Update and extend README.md * Add Catalan translation * build: Use external translations diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bc3d09..c79e8c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,33 +2,28 @@ cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) project(lxqt-notificationd) -option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) +include(GNUInstallDirs) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) -find_package(Qt5Widgets REQUIRED QUIET) -find_package(Qt5DBus REQUIRED QUIET) +find_package(Qt5DBus REQUIRED) find_package(Qt5LinguistTools REQUIRED QUIET) -find_package(KF5WindowSystem REQUIRED QUIET) +find_package(Qt5Widgets REQUIRED) +message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}") -find_package(lxqt REQUIRED QUIET) +find_package(KF5WindowSystem REQUIRED) + +find_package(lxqt REQUIRED) -include(GNUInstallDirs) include(LXQtCompilerSettings NO_POLICY_SCOPE) + +# Translations ********************************** include(LXQtTranslate) -add_subdirectory(src) add_subdirectory(config) - -# building tarball with CPack ------------------------------------------------- -include(InstallRequiredSystemLibraries) -set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION}) -set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION}) -set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION}) -set(CPACK_GENERATOR TBZ2) -set(CPACK_SOURCE_GENERATOR TBZ2) -set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) -include(CPack) +add_subdirectory(src) diff --git a/config/translations/lxqt-config-notificationd_da.desktop b/config/translations/lxqt-config-notificationd_da.desktop index cb4e15e..ba11c84 100644 --- a/config/translations/lxqt-config-notificationd_da.desktop +++ b/config/translations/lxqt-config-notificationd_da.desktop @@ -1,4 +1,3 @@ -# Translations -GenericName[da]=Notesblok -Name[da]=Strømstyring -Comment[da]=Indstil freedesktop meddelelser på LXQt skrivebord +Name[da]=Skrivebordsnotifikationer +GenericName[da]=LXQt-notifikationsindstillinger +Comment[da]=Konfigurér skrivebordsnotifikationer diff --git a/config/translations/lxqt-config-notificationd_da_DK.desktop b/config/translations/lxqt-config-notificationd_da_DK.desktop deleted file mode 100644 index d2aa61c..0000000 --- a/config/translations/lxqt-config-notificationd_da_DK.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[da_DK]=LXQt freedesktop Meddelelsesindstillinger -Name[da_DK]=LXQt freedesktop Meddelelsesindstillinger -Comment[da_DK]=Indstil freedesktop meddelelser på LXQt skrivebord diff --git a/config/translations/lxqt-config-notificationd_fr.desktop b/config/translations/lxqt-config-notificationd_fr.desktop new file mode 100644 index 0000000..645db1c --- /dev/null +++ b/config/translations/lxqt-config-notificationd_fr.desktop @@ -0,0 +1,4 @@ +# Translations +Name[fr]=Paramétrage des notifications +GenericName[fr]=Paramétrage des notifications du bureau LXQt +Comment[fr]=Paramétrage des notifications du bureau LXQt diff --git a/config/translations/lxqt-config-notificationd_fr_FR.desktop b/config/translations/lxqt-config-notificationd_fr_FR.desktop deleted file mode 100644 index d6d9511..0000000 --- a/config/translations/lxqt-config-notificationd_fr_FR.desktop +++ /dev/null @@ -1,3 +0,0 @@ -# Translations -GenericName[fr_FR]=Paramétrage des notifications du bureau -Name[fr_FR]=Paramétrage notifications