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

Signed-off-by: Alf Gaida <agaida@siduction.org>
---
 .gitignore     |  2 --
 CHANGELOG      |  9 ++++++++-
 CMakeLists.txt | 33 ++++++++++++---------------------
 3 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 19e2ab6..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build
-translations/lxqt-openssh-askpass
diff --git a/CHANGELOG b/CHANGELOG
index a3cff21..827fdbf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,14 @@
 
-lxqt-openssh-askpass-0.11.0 / 2016-09-24
+lxqt-openssh-askpass-0.11.1 / 2017-01-01
 ========================================
 
+  * Make CMakeLists.txt more uniform.
+  * Remove cpack (#21)
+
+0.11.0 / 2016-09-24
+===================
+
+  * Release 0.11.0: Add changelog
   * Rework README.md
   * build: Use external translations
   * ts-files removal (#19)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index caf2193..25aeea7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,25 +1,23 @@
 cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
+
 project(lxqt-openssh-askpass)
 
-option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+add_definitions(-Wall)
 
 include(GNUInstallDirs)
 
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release)
-endif()
-
-add_definitions(-Wall)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-find_package(Qt5Widgets REQUIRED QUIET)
-find_package(Qt5LinguistTools REQUIRED QUIET)
+option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
 
-find_package(lxqt REQUIRED QUIET)
+find_package(Qt5LinguistTools REQUIRED QUIET)
+find_package(Qt5Widgets REQUIRED)
+message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
+
+find_package(lxqt REQUIRED)
 
 include(LXQtCompilerSettings NO_POLICY_SCOPE)
 
@@ -36,6 +34,10 @@ set(lxqt-openssh-askpass_UIS
     src/mainwindow.ui
 )
 
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
 # Translations **********************************
 include(LXQtTranslate)
 
@@ -77,14 +79,3 @@ INSTALL(TARGETS
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
     COMPONENT Runtime
 )
-
-
-# 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)