From 2d4810e6b9292543bec102fe07897559847d5a6f Mon Sep 17 00:00:00 2001
From: Alf Gaida <agaida@siduction.org>
Date: Mon, 2 Jan 2017 01:58:21 +0100
Subject: [PATCH] Adding upstream version 0.11.1.

Signed-off-by: Alf Gaida <agaida@siduction.org>
---
 .gitignore                                    |  4 ---
 CHANGELOG                                     | 11 ++++++-
 CMakeLists.txt                                | 32 ++++++++-----------
 .../lxqt-config-powermanagement_da.desktop    |  3 ++
 .../lxqt-config-powermanagement_fr.desktop    |  4 +++
 5 files changed, 31 insertions(+), 23 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 config/translations/lxqt-config-powermanagement_da.desktop
 create mode 100644 config/translations/lxqt-config-powermanagement_fr.desktop

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0494ac2..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build
-nbproject
-*kdev4*
-*/translations/lxqt-powermanagement
diff --git a/CHANGELOG b/CHANGELOG
index 2413613..df8be61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,16 @@
 
-lxqt-powermanagement-0.11.0 / 2016-09-24
+lxqt-powermanagement-0.11.1 / 2017-01-01
 ========================================
 
+  * Add lxqt-config-powermanagement_da.desktop
+  * Create lxqt-config-powermanagement_fr.desktop
+  * Make CMakeLists.txt more uniform.
+  * Remove cpack (#43)
+
+0.11.0 / 2016-09-24
+===================
+
+  * Release 0.11.0: Add changelog
   * README.md: Replace dependency XCB with KIdleTime
   * Idleness Watcher: rely on KIdleTime instead of XCB (#33)
   * fix indents
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 793fbe9..2a7d622 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,34 +2,30 @@ cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 
 project(lxqt-powermanagement)
 
-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)
 find_package(Qt5DBus REQUIRED)
-find_package(Qt5X11Extras REQUIRED)
-find_package(Qt5Svg REQUIRED)
 find_package(Qt5LinguistTools REQUIRED QUIET)
-find_package(lxqt REQUIRED QUIET)
+find_package(Qt5Svg REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5X11Extras REQUIRED)
+message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
+
 find_package(KF5Solid REQUIRED)
 
-include(GNUInstallDirs)
+find_package(lxqt REQUIRED)
+
 include(LXQtCompilerSettings NO_POLICY_SCOPE)
+
+# Translations **********************************
 include(LXQtTranslate)
 
 add_subdirectory(config)
 add_subdirectory(src)
-
-# 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)
diff --git a/config/translations/lxqt-config-powermanagement_da.desktop b/config/translations/lxqt-config-powermanagement_da.desktop
new file mode 100644
index 0000000..85ce4fc
--- /dev/null
+++ b/config/translations/lxqt-config-powermanagement_da.desktop
@@ -0,0 +1,3 @@
+Name[da]=Strømstyring
+GenericName[da]=Indstillinger for strømstyring
+Comment[da]=Diverse indstillinger omhandlende strømstyring såsom batteri eller tomgangsovervågning
diff --git a/config/translations/lxqt-config-powermanagement_fr.desktop b/config/translations/lxqt-config-powermanagement_fr.desktop
new file mode 100644
index 0000000..7506b69
--- /dev/null
+++ b/config/translations/lxqt-config-powermanagement_fr.desktop
@@ -0,0 +1,4 @@
+#Translations
+Name[fr]=Gestion de l'énergie
+GenericName[fr]=Paramétrage de la gestion de l'énergie
+Comment[fr]=Divers paramétrages de la gestion de l'énergie, tels que batteries ou contrôle de l'activité