[almanah] data: Fix localisation of GSettings schema file

[Philip Withnall <pwithnall src gnome org>]

commit d0d9756485bc420e6f8232b4b5a6cd0d729194b3
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Fri Dec 19 22:06:01 2014 +0000

    data: Fix localisation of GSettings schema file
    
    Since intltool 0.50.1, support for GSettings schema files has been
    included natively, without needing to treat them as generic XML files.
    Simplify the build slightly by using this support.
    
    This bumps the intltool dependency to 0.50.1.

 configure.ac                             |    4 ++--
 data/Makefile.am                         |    9 ++-------
 data/org.gnome.almanah.gschema.xml.in    |   20 ++++++++++++++++++++
 data/org.gnome.almanah.gschema.xml.in.in |   20 --------------------
 po/POTFILES.in                           |    2 +-
 5 files changed, 25 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 32bf6e9..b901d3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
 AC_SUBST(GETTEXT_PACKAGE)
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 AC_PROG_CXX
 AM_PROG_CC_C_O
@@ -157,6 +157,6 @@ data/icons/32x32/Makefile
 data/icons/48x48/Makefile
 data/icons/256x256/Makefile
 data/icons/scalable/Makefile
-data/org.gnome.almanah.gschema.xml.in
+data/org.gnome.almanah.gschema.xml
 ])
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
index 9738440..82cee89 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -49,20 +49,15 @@ CLEANFILES += $(desktop_DATA)
 # GSettings schemas
 ###############################################################################
 
+schemas_in_files = org.gnome.almanah.gschema.xml.in
 gsettings_SCHEMAS = org.gnome.almanah.gschema.xml
 
 @GSETTINGS_RULES@
- INTLTOOL_XML_NOMERGE_RULE@
 
 # Data migration tool
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = almanah.convert
-
-EXTRA_DIST += \
-       $(schemas_in_files) \
-       $(convert_DATA) \
-       $(NULL)
-CLEANFILES += $(gsettings_SCHEMAS)
+EXTRA_DIST += $(convert_DATA)
 
 ###############################################################################
 # AppData file
diff --git a/data/org.gnome.almanah.gschema.xml.in b/data/org.gnome.almanah.gschema.xml.in
new file mode 100644
index 0000000..19b5ae7
--- /dev/null
+++ b/data/org.gnome.almanah.gschema.xml.in
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+       <schema id="org.gnome.almanah" path="/org/gnome/Almanah/" gettext-domain="@GETTEXT_PACKAGE@">
+               <key name="encryption-key" type="s">
+                       <default>''</default>
+                       <summary>Database encryption key ID</summary>
+                       <description>The ID of the key to use to encrypt and decrypt the database, if Almanah 
has been built with encryption support. Leave blank to disable database encryption.</description>
+               </key>
+               <key name="spelling-language" type="s">
+                       <default>''</default>
+                       <summary>Spell checking language</summary>
+                       <description>The locale specifier of the language in which to check entry 
spellings.</description>
+               </key>
+               <key name="spell-checking-enabled" type="b">
+                       <default>true</default>
+                       <summary>Spell checking enabled?</summary>
+                       <description>Whether spell checking of entries is enabled.</description>
+               </key>
+       </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 835c6ea..9581c14 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,7 @@ data/almanah.appdata.xml.in
 [type: gettext/glade]data/almanah-app-menu.ui
 data/almanah.desktop.in
 [type: gettext/glade]data/almanah.ui
-data/org.gnome.almanah.gschema.xml.in.in
+[type: gettext/gsettings]data/org.gnome.almanah.gschema.xml.in
 src/application.c
 src/date-entry-dialog.c
 src/entry.c