From 8634255b1b2146795395f573f69bd66cc38c67ac Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 20 Sep 2016 18:45:59 +0200
Subject: build: Ensure we install gsettings schemas

Commit a0c98a08 left us with uninstallable schemas.
---
 configure.ac                                       |  6 +-
 libgnomekbd/Makefile.am                            |  1 +
 .../org.gnome.libgnomekbd.desktop.gschema.xml.in   | 31 ++++++++++
 ...org.gnome.libgnomekbd.desktop.gschema.xml.in.in | 31 ----------
 libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in   | 67 ++++++++++++++++++++++
 .../org.gnome.libgnomekbd.gschema.xml.in.in        | 67 ----------------------
 .../org.gnome.libgnomekbd.keyboard.gschema.xml.in  | 20 +++++++
 ...rg.gnome.libgnomekbd.keyboard.gschema.xml.in.in | 20 -------
 po/POTFILES.in                                     |  6 +-
 9 files changed, 125 insertions(+), 124 deletions(-)
 create mode 100644 libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
 delete mode 100644 libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
 create mode 100644 libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
 delete mode 100644 libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in
 create mode 100644 libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in
 delete mode 100644 libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in

diff --git a/configure.ac b/configure.ac
index 59c08f0..744ccc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,9 +91,9 @@ libgnomekbd.pc
 libgnomekbdui.pc
 po/Makefile.in
 libgnomekbd/Makefile
-libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
-libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in
-libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
+libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml
+libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml
+libgnomekbd/org.gnome.libgnomekbd.gschema.xml
 libgnomekbd/gkbd-keyboard-display.desktop.in
 test/Makefile
 ])
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
index 3609998..577ed02 100644
--- a/libgnomekbd/Makefile.am
+++ b/libgnomekbd/Makefile.am
@@ -13,6 +13,7 @@ icons_DATA = kbdled-caps-lock.svg \
 gsettings_SCHEMAS = org.gnome.libgnomekbd.desktop.gschema.xml \
 		    org.gnome.libgnomekbd.keyboard.gschema.xml \
 		    org.gnome.libgnomekbd.gschema.xml
+@GSETTINGS_RULES@
 
 common_CFLAGS = \
 	-I$(top_srcdir) 				\
diff --git a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
new file mode 100644
index 0000000..bd84f53
--- /dev/null
+++ b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.desktop" path="/org/gnome/libgnomekbd/desktop/">
+    <key name="default-group" type="i">
+      <range min="-1" max="4"/>
+      <default>-1</default>
+      <summary>Default group, assigned on window creation</summary>
+      <description>Default group, assigned on window creation</description>
+    </key>
+    <key name="group-per-window" type="b">
+      <default>false</default>
+      <summary>Keep and manage separate group per window</summary>
+      <description>Keep and manage separate group per window</description>
+    </key>
+    <key name="handle-indicators" type="b">
+      <default>false</default>
+      <summary>Save/restore indicators together with layout groups</summary>
+      <description>Save/restore indicators together with layout groups</description>
+    </key>
+    <key name="layout-names-as-group-names" type="b">
+      <default>true</default>
+      <summary>Show layout names instead of group names</summary>
+      <description>Show layout names instead of group names (only for versions of XFree supporting multiple layouts)</description>
+    </key>
+    <key name="load-extra-items" type="b">
+      <default>false</default>
+      <summary>Load extra configuration items</summary>
+      <description>Load exotic, rarely used layouts and options</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
deleted file mode 100644
index bd84f53..0000000
--- a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.desktop" path="/org/gnome/libgnomekbd/desktop/">
-    <key name="default-group" type="i">
-      <range min="-1" max="4"/>
-      <default>-1</default>
-      <summary>Default group, assigned on window creation</summary>
-      <description>Default group, assigned on window creation</description>
-    </key>
-    <key name="group-per-window" type="b">
-      <default>false</default>
-      <summary>Keep and manage separate group per window</summary>
-      <description>Keep and manage separate group per window</description>
-    </key>
-    <key name="handle-indicators" type="b">
-      <default>false</default>
-      <summary>Save/restore indicators together with layout groups</summary>
-      <description>Save/restore indicators together with layout groups</description>
-    </key>
-    <key name="layout-names-as-group-names" type="b">
-      <default>true</default>
-      <summary>Show layout names instead of group names</summary>
-      <description>Show layout names instead of group names (only for versions of XFree supporting multiple layouts)</description>
-    </key>
-    <key name="load-extra-items" type="b">
-      <default>false</default>
-      <summary>Load extra configuration items</summary>
-      <description>Load exotic, rarely used layouts and options</description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in b/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
new file mode 100644
index 0000000..870db8e
--- /dev/null
+++ b/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd" path="/org/gnome/libgnomekbd/">
+    <child name="preview" schema="org.gnome.libgnomekbd.preview"/>
+    <child name="indicator" schema="org.gnome.libgnomekbd.indicator"/>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.preview" path="/org/gnome/libgnomekbd/preview/">
+    <key name="x" type="i">
+      <range min="-1" max="65535"/>
+      <default>-1</default>
+      <summary>The Keyboard Preview, X offset</summary>
+      <description>The Keyboard Preview, X offset</description>
+    </key>
+    <key name="y" type="i">
+      <range min="-1" max="65535"/>
+      <default>-1</default>
+      <summary>The Keyboard Preview, Y offset</summary>
+      <description>The Keyboard Preview, Y offset</description>
+    </key>
+    <key name="width" type="i">
+      <range min="-1" max="65535"/>
+      <default>-1</default>
+      <summary>The Keyboard Preview, width</summary>
+      <description>The Keyboard Preview, width</description>
+    </key>
+    <key name="height" type="i">
+      <range min="-1" max="65535"/>
+      <default>-1</default>
+      <summary>The Keyboard Preview, height</summary>
+      <description>The Keyboard Preview, height</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.indicator" path="/org/gnome/libgnomekbd/indicator/">
+    <key name="secondary" type="i">
+      <range min="0" max="15"/>
+      <default>0</default>
+      <summary>Secondary groups</summary>
+      <description>Secondary groups</description>
+    </key>
+    <key name="show-flags" type="b">
+      <default>false</default>
+      <summary>Show flags in the applet</summary>
+      <description>Show flags in the applet to indicate the current layout</description>
+    </key>
+    <key name="font-family" type="s">
+      <default>''</default>
+      <summary>The font family</summary>
+      <description>The font family for the layout indicator</description>
+    </key>
+    <key name="font-size" type="i">
+      <range min="1" max="65535"/>
+      <default>10</default>
+      <summary>The font size</summary>
+      <description>The font size for the layout indicator</description>
+    </key>
+    <key name="foreground-color" type="s">
+      <default>''</default>
+      <summary>The foreground color</summary>
+      <description>The foreground color for the layout indicator</description>
+    </key>
+    <key name="background-color" type="s">
+      <default>''</default>
+      <summary>The background color</summary>
+      <description>The background color for the layout indicator</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in b/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in
deleted file mode 100644
index 870db8e..0000000
--- a/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd" path="/org/gnome/libgnomekbd/">
-    <child name="preview" schema="org.gnome.libgnomekbd.preview"/>
-    <child name="indicator" schema="org.gnome.libgnomekbd.indicator"/>
-  </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.preview" path="/org/gnome/libgnomekbd/preview/">
-    <key name="x" type="i">
-      <range min="-1" max="65535"/>
-      <default>-1</default>
-      <summary>The Keyboard Preview, X offset</summary>
-      <description>The Keyboard Preview, X offset</description>
-    </key>
-    <key name="y" type="i">
-      <range min="-1" max="65535"/>
-      <default>-1</default>
-      <summary>The Keyboard Preview, Y offset</summary>
-      <description>The Keyboard Preview, Y offset</description>
-    </key>
-    <key name="width" type="i">
-      <range min="-1" max="65535"/>
-      <default>-1</default>
-      <summary>The Keyboard Preview, width</summary>
-      <description>The Keyboard Preview, width</description>
-    </key>
-    <key name="height" type="i">
-      <range min="-1" max="65535"/>
-      <default>-1</default>
-      <summary>The Keyboard Preview, height</summary>
-      <description>The Keyboard Preview, height</description>
-    </key>
-  </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.indicator" path="/org/gnome/libgnomekbd/indicator/">
-    <key name="secondary" type="i">
-      <range min="0" max="15"/>
-      <default>0</default>
-      <summary>Secondary groups</summary>
-      <description>Secondary groups</description>
-    </key>
-    <key name="show-flags" type="b">
-      <default>false</default>
-      <summary>Show flags in the applet</summary>
-      <description>Show flags in the applet to indicate the current layout</description>
-    </key>
-    <key name="font-family" type="s">
-      <default>''</default>
-      <summary>The font family</summary>
-      <description>The font family for the layout indicator</description>
-    </key>
-    <key name="font-size" type="i">
-      <range min="1" max="65535"/>
-      <default>10</default>
-      <summary>The font size</summary>
-      <description>The font size for the layout indicator</description>
-    </key>
-    <key name="foreground-color" type="s">
-      <default>''</default>
-      <summary>The foreground color</summary>
-      <description>The foreground color for the layout indicator</description>
-    </key>
-    <key name="background-color" type="s">
-      <default>''</default>
-      <summary>The background color</summary>
-      <description>The background color for the layout indicator</description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in b/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in
new file mode 100644
index 0000000..02fc1c5
--- /dev/null
+++ b/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.keyboard" path="/org/gnome/libgnomekbd/keyboard/">
+    <key name="model" type="s">
+      <default>''</default>
+      <summary>Keyboard model</summary>
+      <description>keyboard model</description>
+    </key>
+    <key name="layouts" type="as">
+      <default>[]</default>
+      <summary>Keyboard layout</summary>
+      <description>keyboard layout</description>
+    </key>
+    <key name="options" type="as">
+      <default>[]</default>
+      <summary>Keyboard options</summary>
+      <description>Keyboard options</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in b/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in
deleted file mode 100644
index 02fc1c5..0000000
--- a/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.keyboard" path="/org/gnome/libgnomekbd/keyboard/">
-    <key name="model" type="s">
-      <default>''</default>
-      <summary>Keyboard model</summary>
-      <description>keyboard model</description>
-    </key>
-    <key name="layouts" type="as">
-      <default>[]</default>
-      <summary>Keyboard layout</summary>
-      <description>keyboard layout</description>
-    </key>
-    <key name="options" type="as">
-      <default>[]</default>
-      <summary>Keyboard options</summary>
-      <description>Keyboard options</description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 67e496c..f79b367 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,8 +8,8 @@ libgnomekbd/gkbd-keyboard-display.desktop.in.in
 libgnomekbd/gkbd-keyboard-drawing.c
 libgnomekbd/gkbd-status.c
 libgnomekbd/gkbd-util.c
-libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
-libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in
-libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in
+libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
+libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
+libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in
 libgnomekbd/show-layout.ui
 test/gkbd-indicator-test.c
-- 
cgit v1.2.1