From e3f31de1e4718b6888ae613133802020dcecd303 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 12 Nov 2015 13:36:00 +0100
Subject: Fork from Ubuntu's indicator-keyboard.

---
 data/Makefile.am                                  | 70 +++++++++++------------
 data/com.canonical.indicator.keyboard.gschema.xml | 15 -----
 data/org.ayatana.indicator.keyboard.gschema.xml   | 15 +++++
 3 files changed, 50 insertions(+), 50 deletions(-)
 delete mode 100644 data/com.canonical.indicator.keyboard.gschema.xml
 create mode 100644 data/org.ayatana.indicator.keyboard.gschema.xml

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 61e5c37f..bb9a1f82 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = upstart
 # Icon Generator
 ###########################
 
-noinst_PROGRAMS = indicator-keyboard-icon-generator
+noinst_PROGRAMS = ayatana-indicator-keyboard-icon-generator
 
 AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API
 AM_LDFLAGS = -lm
@@ -13,38 +13,38 @@ AM_VALAFLAGS = --enable-experimental-non-null   \
                --metadatadir $(top_srcdir)/deps \
                --vapidir $(top_srcdir)/deps
 
-indicator_keyboard_icon_generator_SOURCES = main.vala                     \
-                                            $(top_srcdir)/lib/common.vala
-indicator_keyboard_icon_generator_VALAFLAGS = $(AM_VALAFLAGS)         \
-                                              --pkg gee-1.0           \
-                                              --pkg fontconfig-2.0    \
-                                              --pkg freetype2-2.0     \
-                                              --pkg PangoFT2-1.0      \
-                                              --pkg gtk+-3.0          \
-                                              --pkg GDesktopEnums-3.0 \
-                                              --pkg GnomeDesktop-3.0  \
+ayatana_indicator_keyboard_icon_generator_SOURCES = main.vala                     \
+                                                    $(top_srcdir)/lib/common.vala
+ayatana_indicator_keyboard_icon_generator_VALAFLAGS = $(AM_VALAFLAGS)         \
+                                                      --pkg gee-1.0           \
+                                                      --pkg fontconfig-2.0    \
+                                                      --pkg freetype2-2.0     \
+                                                      --pkg PangoFT2-1.0      \
+                                                      --pkg gtk+-3.0          \
+                                                      --pkg GDesktopEnums-3.0 \
+                                                      --pkg GnomeDesktop-3.0  \
                                               --pkg Xkl-1.0
-indicator_keyboard_icon_generator_CFLAGS = $(AM_CFLAGS)            \
-                                           $(GEE_CFLAGS)           \
-                                           $(PANGOFT2_CFLAGS)      \
-                                           $(GTK_CFLAGS)           \
-                                           $(GNOME_DESKTOP_CFLAGS) \
-                                           $(LIBXKLAVIER_CFLAGS)   \
-                                           $(COVERAGE_CFLAGS)
-indicator_keyboard_icon_generator_LDFLAGS = $(AM_LDFLAGS)         \
-                                            $(GEE_LIBS)           \
-                                            $(PANGOFT2_LIBS)      \
-                                            $(GTK_LIBS)           \
-                                            $(GNOME_DESKTOP_LIBS) \
-                                            $(LIBXKLAVIER_LIBS)   \
-                                            $(COVERAGE_LDFLAGS)
+ayatana_indicator_keyboard_icon_generator_CFLAGS = $(AM_CFLAGS)            \
+                                                   $(GEE_CFLAGS)           \
+                                                   $(PANGOFT2_CFLAGS)      \
+                                                   $(GTK_CFLAGS)           \
+                                                   $(GNOME_DESKTOP_CFLAGS) \
+                                                   $(LIBXKLAVIER_CFLAGS)   \
+                                                   $(COVERAGE_CFLAGS)
+ayatana_indicator_keyboard_icon_generator_LDFLAGS = $(AM_LDFLAGS)         \
+                                                    $(GEE_LIBS)           \
+                                                    $(PANGOFT2_LIBS)      \
+                                                    $(GTK_LIBS)           \
+                                                    $(GNOME_DESKTOP_LIBS) \
+                                                    $(LIBXKLAVIER_LIBS)   \
+                                                    $(COVERAGE_LDFLAGS)
 
 ###########################
 # Upstart Config
 ###########################
 
 upstart_jobsdir = $(datadir)/upstart/sessions/
-upstart_jobs_DATA = indicator-keyboard.conf
+upstart_jobs_DATA = ayatana-indicator-keyboard.conf
 
 %.conf: %.conf.in
 	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
@@ -54,7 +54,7 @@ upstart_jobs_DATA = indicator-keyboard.conf
 ###########################
 
 xdg_autostartdir = /etc/xdg/autostart
-xdg_autostart_DATA = indicator-keyboard.desktop
+xdg_autostart_DATA = ayatana-indicator-keyboard.desktop
 
 %.desktop: %.desktop.in
 	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
@@ -63,33 +63,33 @@ xdg_autostart_DATA = indicator-keyboard.desktop
 # Indicator Config
 ###########################
 
-dist_indicator_DATA = com.canonical.indicator.keyboard
+dist_indicator_DATA = org.ayatana.indicator.keyboard
 indicatordir = $(INDICATOR_DIR)
 
-com.canonical.indicator.keyboard:
+org.ayatana.indicator.keyboard:
 	$(AM_V_GEN) (echo '[Indicator Service]';                                              \
 	             echo 'Name=indicator-keyboard';                                          \
-	             echo 'ObjectPath=/com/canonical/indicator/keyboard';                     \
+	             echo 'ObjectPath=/org/ayatana/indicator/keyboard';                     \
 	             echo 'Position=80';                                                      \
 	             echo '';                                                                 \
 	             echo '[desktop]';                                                        \
-	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop';             \
+	             echo 'ObjectPath=/org/ayatana/indicator/keyboard/desktop';             \
 	             echo '';                                                                 \
 	             echo '[desktop_greeter]';                                                \
-	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop_greeter';     \
+	             echo 'ObjectPath=/org/ayatana/indicator/keyboard/desktop_greeter';     \
 	             echo '';                                                                 \
 	             echo '[desktop_lockscreen]';                                             \
-	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop_lockscreen';  \
+	             echo 'ObjectPath=/org/ayatana/indicator/keyboard/desktop_lockscreen';  \
 	             echo '';                                                                 \
 	             echo '[ubiquity]';                                                       \
-	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop') > $@.tmp && \
+	             echo 'ObjectPath=/org/ayatana/indicator/keyboard/desktop') > $@.tmp && \
 	            mv $@.tmp $@
 
 ###########################
 # GSettings Schemas
 ###########################
 
-gsettings_SCHEMAS = com.canonical.indicator.keyboard.gschema.xml
+gsettings_SCHEMAS = org.ayatana.indicator.keyboard.gschema.xml
 
 @GSETTINGS_RULES@
 
diff --git a/data/com.canonical.indicator.keyboard.gschema.xml b/data/com.canonical.indicator.keyboard.gschema.xml
deleted file mode 100644
index 9ee74fd3..00000000
--- a/data/com.canonical.indicator.keyboard.gschema.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <schema id="com.canonical.indicator.keyboard" path="/com/canonical/indicator/keyboard/">
-    <key name="migrated" type="b">
-      <summary>Keyboard layouts migrated</summary>
-      <description>True if keyboard layouts were migrated, false otherwise.</description>
-      <default>false</default>
-    </key>
-    <key name="visible" type="b">
-      <summary>Keyboard indicator visibility</summary>
-      <description>True if the keyboard indicator is shown, false otherwise.</description>
-      <default>true</default>
-    </key>
-  </schema>
-</schemalist>
diff --git a/data/org.ayatana.indicator.keyboard.gschema.xml b/data/org.ayatana.indicator.keyboard.gschema.xml
new file mode 100644
index 00000000..81ca4537
--- /dev/null
+++ b/data/org.ayatana.indicator.keyboard.gschema.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema id="org.ayatana.indicator.keyboard" path="/org/ayatana/indicator/keyboard/">
+    <key name="migrated" type="b">
+      <summary>Keyboard layouts migrated</summary>
+      <description>True if keyboard layouts were migrated, false otherwise.</description>
+      <default>false</default>
+    </key>
+    <key name="visible" type="b">
+      <summary>Keyboard indicator visibility</summary>
+      <description>True if the keyboard indicator is shown, false otherwise.</description>
+      <default>true</default>
+    </key>
+  </schema>
+</schemalist>
-- 
cgit v1.2.3