6 files changed, 42 insertions, 10 deletions
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
 ##
@@ -19,13 +21,19 @@ 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/indicator-display.conf.in b/data/ayatana-indicator-display.conf.in
index 2fbabc4..2fbabc4 100644
--- a/data/indicator-display.conf.in
+++ b/data/ayatana-indicator-display.conf.in
diff --git a/data/indicator-display.override b/data/ayatana-indicator-display.override
index 2905494..2905494 100644
--- a/data/indicator-display.override
+++ b/data/ayatana-indicator-display.override
diff --git a/data/indicator-display.service.in b/data/ayatana-indicator-display.service.in
index 8245917..8245917 100644
--- a/data/indicator-display.service.in
+++ b/data/ayatana-indicator-display.service.in
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/com.canonical.indicator.rotation_lock b/data/org.ayatana.indicator.rotation_lock
index 7740db7..7740db7 100644
--- a/data/com.canonical.indicator.rotation_lock
+++ b/data/org.ayatana.indicator.rotation_lock