From de76813c8421fd900e0d57038d28e8be693e33be Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 28 Nov 2017 08:47:03 +0000
Subject: Fork from Ubuntus' indicator-display project.

---
 data/CMakeLists.txt                        | 28 ++++++++++++++++++----------
 data/ayatana-indicator-display.conf.in     |  9 +++++++++
 data/ayatana-indicator-display.override    |  1 +
 data/ayatana-indicator-display.service.in  |  8 ++++++++
 data/com.canonical.indicator.rotation_lock | 11 -----------
 data/indicator-display.conf.in             |  9 ---------
 data/indicator-display.override            |  1 -
 data/indicator-display.service.in          |  8 --------
 data/org.ayatana.display.gschema.xml       | 24 ++++++++++++++++++++++++
 data/org.ayatana.indicator.rotation_lock   | 11 +++++++++++
 10 files changed, 71 insertions(+), 39 deletions(-)
 create mode 100644 data/ayatana-indicator-display.conf.in
 create mode 100644 data/ayatana-indicator-display.override
 create mode 100644 data/ayatana-indicator-display.service.in
 delete mode 100644 data/com.canonical.indicator.rotation_lock
 delete mode 100644 data/indicator-display.conf.in
 delete mode 100644 data/indicator-display.override
 delete mode 100644 data/indicator-display.service.in
 create mode 100644 data/org.ayatana.display.gschema.xml
 create mode 100644 data/org.ayatana.indicator.rotation_lock

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index d74ca48..7f10bac 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(GSettings)
+
 ##
 ##  Upstart Job File
 ##
@@ -18,14 +20,20 @@ configure_file ("${UPSTART_JOB_FILE_IN}" "${UPSTART_JOB_FILE}")
 install (FILES "${UPSTART_JOB_FILE}"
          DESTINATION "${UPSTART_JOBS_DIR}")
 
+##
+## GSettings
+##
+
+if(NOT EXISTS /usr/share/glib-2.0/schemas/com.ubuntu.touch.system.gschema.xml)
+  add_schema ("org.ayatana.display.gschema.xml")
+endif()
+
 ##
 ##  Systemd Unit File
 ##
 
 # where to install
-# Uncomment when we drop Vivid
-# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
-set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
+pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
 message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
 
 set (SYSTEMD_USER_NAME "${CMAKE_PROJECT_NAME}.service")
@@ -51,15 +59,15 @@ install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.override"
          DESTINATION "${UPSTART_SYSTEMD_OVERRIDE_DIR}")
 
 ##
-##  Unity Indicator File
+##  Ayatana Indicator File
 ##
 
 # where to install
-set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/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 "com.canonical.indicator.rotation_lock")
-set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
+set (AYATANA_INDICATOR_NAME "org.ayatana.indicator.rotation_lock")
+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-display.conf.in b/data/ayatana-indicator-display.conf.in
new file mode 100644
index 0000000..2fbabc4
--- /dev/null
+++ b/data/ayatana-indicator-display.conf.in
@@ -0,0 +1,9 @@
+description "Indicator Display Backend"
+
+start on indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+respawn limit 2 10
+
+exec @pkglibexecdir@/indicator-display-service
diff --git a/data/ayatana-indicator-display.override b/data/ayatana-indicator-display.override
new file mode 100644
index 0000000..2905494
--- /dev/null
+++ b/data/ayatana-indicator-display.override
@@ -0,0 +1 @@
+manual
diff --git a/data/ayatana-indicator-display.service.in b/data/ayatana-indicator-display.service.in
new file mode 100644
index 0000000..8245917
--- /dev/null
+++ b/data/ayatana-indicator-display.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Indicator Display Backend
+PartOf=graphical-session.target
+After=indicators-pre.target
+
+[Service]
+ExecStart=@pkglibexecdir@/indicator-display-service
+Restart=on-failure
diff --git a/data/com.canonical.indicator.rotation_lock b/data/com.canonical.indicator.rotation_lock
deleted file mode 100644
index 7740db7..0000000
--- a/data/com.canonical.indicator.rotation_lock
+++ /dev/null
@@ -1,11 +0,0 @@
-[Indicator Service]
-Name=indicator-rotation-lock
-ObjectPath=/com/canonical/indicator/rotation_lock
-Position=90
-
-[phone]
-ObjectPath=/com/canonical/indicator/rotation_lock/phone
-
-[phone_greeter]
-ObjectPath=/com/canonical/indicator/rotation_lock/phone
-
diff --git a/data/indicator-display.conf.in b/data/indicator-display.conf.in
deleted file mode 100644
index 2fbabc4..0000000
--- a/data/indicator-display.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-description "Indicator Display Backend"
-
-start on indicator-services-start
-stop on desktop-end or indicator-services-end
-
-respawn
-respawn limit 2 10
-
-exec @pkglibexecdir@/indicator-display-service
diff --git a/data/indicator-display.override b/data/indicator-display.override
deleted file mode 100644
index 2905494..0000000
--- a/data/indicator-display.override
+++ /dev/null
@@ -1 +0,0 @@
-manual
diff --git a/data/indicator-display.service.in b/data/indicator-display.service.in
deleted file mode 100644
index 8245917..0000000
--- a/data/indicator-display.service.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Indicator Display Backend
-PartOf=graphical-session.target
-After=indicators-pre.target
-
-[Service]
-ExecStart=@pkglibexecdir@/indicator-display-service
-Restart=on-failure
diff --git a/data/org.ayatana.display.gschema.xml b/data/org.ayatana.display.gschema.xml
new file mode 100644
index 0000000..70d6e46
--- /dev/null
+++ b/data/org.ayatana.display.gschema.xml
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="ayatana-indicator-display">
+  <enum id="org.ayatana.display.ScreenOrientation">
+    <value value="0" nick="none"/>
+    <value value="1" nick="PrimaryOrientation"/>
+    <value value="2" nick="LandscapeOrientation"/>
+    <value value="3" nick="PortraitOrientation"/>
+    <value value="4" nick="InvertedLandscapeOrientation"/>
+    <value value="5" nick="InvertedPortraitOrientation"/>
+  </enum>
+  <schema id="org.ayatana.display" path="/org/ayatana/display/">
+    <key name="rotation-lock" type="b">
+      <default>false</default>
+      <summary>Lock rotation</summary>
+      <description>
+      Lock automatic display rotation.
+      </description>
+    </key>
+    <key name="orientation-lock" enum="org.ayatana.display.ScreenOrientation">
+      <default>"none"</default>
+      <summary>Orientation lock</summary>
+      <description>Locks orientation to a specific value.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.ayatana.indicator.rotation_lock b/data/org.ayatana.indicator.rotation_lock
new file mode 100644
index 0000000..7740db7
--- /dev/null
+++ b/data/org.ayatana.indicator.rotation_lock
@@ -0,0 +1,11 @@
+[Indicator Service]
+Name=indicator-rotation-lock
+ObjectPath=/com/canonical/indicator/rotation_lock
+Position=90
+
+[phone]
+ObjectPath=/com/canonical/indicator/rotation_lock/phone
+
+[phone_greeter]
+ObjectPath=/com/canonical/indicator/rotation_lock/phone
+
-- 
cgit v1.2.3