From 92b531ab36fd451c06245de869e75c410456f93c Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 15 Aug 2020 12:30:23 +0200
Subject: CMakeLists.txt: Add PROJECT_VERSION.

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 886b529..9c8b3ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8.9)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
+set(PROJECT_VERSION "0.2")
 set(PACKAGE ${CMAKE_PROJECT_NAME})
 set(SERVICE_LIB ${PACKAGE})
 set(SERVICE_EXEC "${PACKAGE}-service")
-- 
cgit v1.2.3


From db509ce55726cf0017fc5309f8034ab810779926 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 15 Aug 2020 12:30:47 +0200
Subject: CMakeLists.txt: white-space fix.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c8b3ee..69b245f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(SERVICE_EXEC "${PACKAGE}-service")
 
 ##
 ##  GNU standard paths
-## 
+##
 
 include(GNUInstallDirs)
 set(CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
-- 
cgit v1.2.3


From 363e3a0bfab70884d75d5fa54e7eb96db5fb32a0 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 15 Aug 2020 12:32:12 +0200
Subject: CMakeLists.txt: Earlier inclusion of GNUInstallDirs.

---
 CMakeLists.txt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69b245f..fbc6a20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,20 +3,19 @@ cmake_minimum_required(VERSION 2.8.9)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
+##
+##  GNU standard paths
+##
+include(GNUInstallDirs)
+
 set(PROJECT_VERSION "0.2")
 set(PACKAGE ${CMAKE_PROJECT_NAME})
 set(SERVICE_LIB ${PACKAGE})
 set(SERVICE_EXEC "${PACKAGE}-service")
 
-##
-##  GNU standard paths
-##
-
-include(GNUInstallDirs)
 set(CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
 set(CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
 
-
 ##
 ## Gettext
 ##
-- 
cgit v1.2.3


From 47c32024f8c476a80ea365a962b85213e043c6d1 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 15 Aug 2020 12:35:37 +0200
Subject: CMakeLists.txt: Make running unit tests at build time optional, same
 for coverage reports.

Fixes AyatanaIndicators/ayatana-indicator-display#3.
---
 CMakeLists.txt | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbc6a20..bb4b531 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,9 @@ set(PACKAGE ${CMAKE_PROJECT_NAME})
 set(SERVICE_LIB ${PACKAGE})
 set(SERVICE_EXEC "${PACKAGE}-service")
 
+option(enable_tests "Build the package's automatic tests." ON)
+option(enable_coverage "Generate code coverage reports." OFF)
+
 set(CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
 set(CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
 
@@ -75,11 +78,15 @@ add_subdirectory(po)
 ##  Testing & Coverage
 ##
 
-enable_testing()
-add_subdirectory(tests)
-find_package(CoverageReport)
-ENABLE_COVERAGE_REPORT(
-  TARGETS ${SERVICE_LIB} ${SERVICE_EXEC}
-  TESTS ${COVERAGE_TEST_TARGETS}
-  FILTER /usr/include ${CMAKE_BINARY_DIR}/*
-)
+if(${enable_tests})
+  enable_testing()
+  add_subdirectory(tests)
+  if (${enable_coverage})
+    find_package(CoverageReport)
+    ENABLE_COVERAGE_REPORT(
+      TARGETS ${SERVICE_LIB} ${SERVICE_EXEC}
+      TESTS ${COVERAGE_TEST_TARGETS}
+      FILTER /usr/include ${CMAKE_BINARY_DIR}/*
+    )
+  endif()
+endif()
-- 
cgit v1.2.3


From efcda4b07e5d543cd448fd0340ca1ffe288f3a10 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 14 Aug 2020 22:38:45 +0200
Subject: Drop all references to upstart.

---
 data/CMakeLists.txt                     | 30 ------------------------------
 data/ayatana-indicator-display.override |  1 -
 2 files changed, 31 deletions(-)
 delete mode 100644 data/ayatana-indicator-display.override

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 7f10bac..177e8fd 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,25 +1,5 @@
 find_package(GSettings)
 
-##
-##  Upstart Job File
-##
-
-# where to install
-set (UPSTART_JOBS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions")
-message (STATUS "${UPSTART_JOBS_DIR} is the Upstart Jobs File install dir")
-
-set (UPSTART_JOB_NAME "${CMAKE_PROJECT_NAME}.conf")
-set (UPSTART_JOB_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_JOB_NAME}")
-set (UPSTART_JOB_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_JOB_NAME}.in")
-
-# build it
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
-configure_file ("${UPSTART_JOB_FILE_IN}" "${UPSTART_JOB_FILE}")
-
-# install it
-install (FILES "${UPSTART_JOB_FILE}"
-         DESTINATION "${UPSTART_JOBS_DIR}")
-
 ##
 ## GSettings
 ##
@@ -48,16 +28,6 @@ configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}")
 install (FILES "${SYSTEMD_USER_FILE}"
          DESTINATION "${SYSTEMD_USER_DIR}")
 
-##
-##  Upstart systemd override Job File
-##
-
-set (UPSTART_SYSTEMD_OVERRIDE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart")
-message (STATUS "${UPSTART_SYSTEMD_OVERRIDE_DIR} is the Upstart override Job File for systemd dir")
-
-install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.override"
-         DESTINATION "${UPSTART_SYSTEMD_OVERRIDE_DIR}")
-
 ##
 ##  Ayatana Indicator File
 ##
diff --git a/data/ayatana-indicator-display.override b/data/ayatana-indicator-display.override
deleted file mode 100644
index 2905494..0000000
--- a/data/ayatana-indicator-display.override
+++ /dev/null
@@ -1 +0,0 @@
-manual
-- 
cgit v1.2.3