[gnome-documents] Utilize intltool 0.50 gsettings support

[Michael Catanzaro <mcatanzaro src gnome org>]

commit e921ba3f5a5fa1c5a87685007e0297995e3e1207
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Sep 11 21:29:09 2013 -0500

    Utilize intltool 0.50 gsettings support
    
    This lets us replace @INTLTOOL_XML_NOMERGE_RULE@ with
    @INTLTOOL_XML_RULE@ so that we can merge the appdata translations into
    the installed file
    
    https://bugzilla.gnome.org/show_bug.cgi?id=707946

 .gitignore                                         |    1 -
 configure.ac                                       |    2 +-
 data/Makefile.am                                   |   11 +++++------
 ...hema.xml.in => org.gnome.documents.gschema.xml} |   16 ++++++++--------
 po/POTFILES.in                                     |    2 +-
 5 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd370eb..225db6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ data/gnome-documents.desktop
 data/gnome-documents.desktop.in
 data/org.gnome.Documents.enums.xml
 data/org.gnome.documents.gschema.valid
-data/org.gnome.documents.gschema.xml
 intltool-extract.in
 intltool-merge.in
 intltool-update.in
diff --git a/configure.ac b/configure.ac
index d95f5b4..2223d12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AM_MAINTAINER_MODE([enable])
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
-IT_PROG_INTLTOOL(0.40.0)
+IT_PROG_INTLTOOL(0.50.1)
 PKG_PROG_PKG_CONFIG([0.22])
 
 GOBJECT_INTROSPECTION_REQUIRE([0.9.6])
diff --git a/data/Makefile.am b/data/Makefile.am
index a4c7765..524540f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,6 +4,8 @@ appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = gnome-documents.appdata.xml.in
 
+ INTLTOOL_XML_RULE@
+
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 desktop_in_files = gnome-documents.desktop.in
@@ -20,11 +22,9 @@ gsettings_ENUM_NAMESPACE = org.gnome.Documents
 gsettings_ENUM_FILES = \
     $(top_srcdir)/libgd/libgd/gd-main-view.h
 
-gsettingsschema_in_files = org.gnome.documents.gschema.xml.in
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = org.gnome.documents.gschema.xml
 .PRECIOUS: $(gsettings_SCHEMAS)
 
- INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST= \
@@ -32,9 +32,8 @@ EXTRA_DIST= \
     $(appdata_in_files) \
     $(desktop_in_files) \
     $(searchprovider_DATA) \
-    $(gsettingsschema_in_files)
+    $(gsettings_SCHEMAS)
 
 CLEANFILES = \
     $(appdata_DATA) \
-    $(desktop_DATA) \
-    $(gsettings_SCHEMAS)
+    $(desktop_DATA)
diff --git a/data/org.gnome.documents.gschema.xml.in b/data/org.gnome.documents.gschema.xml
similarity index 55%
rename from data/org.gnome.documents.gschema.xml.in
rename to data/org.gnome.documents.gschema.xml
index 302c84f..6bbe010 100644
--- a/data/org.gnome.documents.gschema.xml.in
+++ b/data/org.gnome.documents.gschema.xml
@@ -2,23 +2,23 @@
   <schema id="org.gnome.documents" path="/org/gnome/documents/">
     <key name="view-as" enum="org.gnome.Documents.GdMainViewType">
       <default>'icon'</default>
-      <_summary>View as</_summary>
-      <_description>View as type</_description>
+      <summary>View as</summary>
+      <description>View as type</description>
     </key>
     <key name="window-size" type="ai">
       <default>[768, 600]</default>
-      <_summary>Window size</_summary>
-      <_description>Window size (width and height).</_description>
+      <summary>Window size</summary>
+      <description>Window size (width and height).</description>
     </key>
     <key name="window-position" type="ai">
       <default>[]</default>
-      <_summary>Window position</_summary>
-      <_description>Window position (x and y).</_description>
+      <summary>Window position</summary>
+      <description>Window position (x and y).</description>
     </key>
     <key name="window-maximized" type="b">
       <default>true</default>
-      <_summary>Window maximized</_summary>
-      <_description>Window maximized state</_description>
+      <summary>Window maximized</summary>
+      <description>Window maximized state</description>
     </key>
   </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e0bb7f7..4b627ca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 [encoding: UTF-8]
 data/gnome-documents.appdata.xml.in
 data/gnome-documents.desktop.in.in
-data/org.gnome.documents.gschema.xml.in
+data/org.gnome.documents.gschema.xml
 src/application.js
 src/documents.js
 src/edit.js