From 95ab717cd3ba19378e5b9874dc4c751418999829 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 8 Dec 2017 13:04:41 +0100
Subject: data/: Fix file namespaces for XDG and upstart files.

---
 CMakeLists.txt                                     |  2 +-
 data/CMakeLists.txt                                | 14 +++++++-------
 data/ayatana-indicator-datetime.conf.in            |  9 +++++++++
 data/ayatana-indicator-datetime.desktop.in         |  9 +++++++++
 data/ayatana-indicator-datetime.upstart.desktop.in |  9 +++++++++
 data/indicator-datetime.conf.in                    |  9 ---------
 data/indicator-datetime.desktop.in                 |  9 ---------
 data/indicator-datetime.upstart.desktop.in         |  9 ---------
 8 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 data/ayatana-indicator-datetime.conf.in
 create mode 100644 data/ayatana-indicator-datetime.desktop.in
 create mode 100644 data/ayatana-indicator-datetime.upstart.desktop.in
 delete mode 100644 data/indicator-datetime.conf.in
 delete mode 100644 data/indicator-datetime.desktop.in
 delete mode 100644 data/indicator-datetime.upstart.desktop.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d897c5..33cd797 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project (indicator-datetime C CXX)
+project (ayatana-indicator-datetime C CXX)
 cmake_minimum_required (VERSION 2.8.9)
 
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 278b7e3..28b2e17 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -76,15 +76,15 @@ install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
          RENAME "${XDG_AUTOSTART_NAME}")
 
 ##
-##  Unity Indicator File
+##  Ayatana Indicator File
 ##
 
 # where to install
-set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators")
-message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
+set (AYATANA_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators")
+message (STATUS "${AYATANA_INDICATOR_DIR} is the Ayatana Indicator install dir")
 
-set (UNITY_INDICATOR_NAME "org.ayatana.indicator.datetime")
-set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
+set (AYATANA_INDICATOR_NAME "org.ayatana.indicator.datetime")
+set (AYATANA_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${AYATANA_INDICATOR_NAME}")
 
-install (FILES "${UNITY_INDICATOR_FILE}"
-         DESTINATION "${UNITY_INDICATOR_DIR}")
+install (FILES "${AYATANA_INDICATOR_FILE}"
+         DESTINATION "${AYATANA_INDICATOR_DIR}")
diff --git a/data/ayatana-indicator-datetime.conf.in b/data/ayatana-indicator-datetime.conf.in
new file mode 100644
index 0000000..9b43b96
--- /dev/null
+++ b/data/ayatana-indicator-datetime.conf.in
@@ -0,0 +1,9 @@
+description "Indicator Date & Time Backend"
+
+start on indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+respawn limit 2 10
+
+exec @pkglibexecdir@/indicator-datetime-service
diff --git a/data/ayatana-indicator-datetime.desktop.in b/data/ayatana-indicator-datetime.desktop.in
new file mode 100644
index 0000000..ab1174d
--- /dev/null
+++ b/data/ayatana-indicator-datetime.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Date & Time
+Exec=@pkglibexecdir@/indicator-datetime-service
+OnlyShowIn=MATE;Unity;GNOME;Pantheon;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/ayatana-indicator-datetime.upstart.desktop.in b/data/ayatana-indicator-datetime.upstart.desktop.in
new file mode 100644
index 0000000..076d373
--- /dev/null
+++ b/data/ayatana-indicator-datetime.upstart.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Date & Time
+Exec=@pkglibexecdir@/indicator-datetime-service
+OnlyShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true
diff --git a/data/indicator-datetime.conf.in b/data/indicator-datetime.conf.in
deleted file mode 100644
index 9b43b96..0000000
--- a/data/indicator-datetime.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-description "Indicator Date & Time Backend"
-
-start on indicator-services-start
-stop on desktop-end or indicator-services-end
-
-respawn
-respawn limit 2 10
-
-exec @pkglibexecdir@/indicator-datetime-service
diff --git a/data/indicator-datetime.desktop.in b/data/indicator-datetime.desktop.in
deleted file mode 100644
index ab1174d..0000000
--- a/data/indicator-datetime.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Date & Time
-Exec=@pkglibexecdir@/indicator-datetime-service
-OnlyShowIn=MATE;Unity;GNOME;Pantheon;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/indicator-datetime.upstart.desktop.in b/data/indicator-datetime.upstart.desktop.in
deleted file mode 100644
index 076d373..0000000
--- a/data/indicator-datetime.upstart.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Date & Time
-Exec=@pkglibexecdir@/indicator-datetime-service
-OnlyShowIn=Unity;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-Hidden=true
-- 
cgit v1.2.3