[gnome-photos/gnome-3-10] Utilize intltool 0.50 gsettings support

[Debarshi Ray <debarshir src gnome org>]

commit 17cbb5427259c45a1649b632ea44fbc43022bb29
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Fri Sep 13 18:48:38 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=708054

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    8 +++-----
 ...gschema.xml.in => org.gnome.photos.gschema.xml} |   12 ++++++------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e2dee72..0bdfd13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ GNOME_COMPILE_WARNINGS([maximum])
 GNOME_DEBUG_CHECK
 GNOME_MAINTAINER_MODE_DEFINES
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/data/Makefile.am b/data/Makefile.am
index adab186..0eedfea 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,8 +10,7 @@ desktop_in_files = $(PACKAGE_TARNAME).desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-gsettings_in_files = org.gnome.photos.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = org.gnome.photos.gschema.xml
 .PRECIOUS: $(gsettings_SCHEMAS)
 
 iconsdir = $(pkgdatadir)/icons
@@ -19,19 +18,18 @@ dist_icons_DATA = \
        thumbnail-frame.png \
        $(NULL)
 
- INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
        $(appdata_in_files) \
        $(desktop_in_in_files) \
-       $(gsettings_in_files) \
+       $(gsettings_SCHEMAS) \
        $(NULL)
 
 CLEANFILES = \
        $(appdata_DATA) \
        $(desktop_DATA) \
-       $(gsettings_SCHEMAS) \
        $(NULL)
 
 DISTCLEANFILES = \
diff --git a/data/org.gnome.photos.gschema.xml.in b/data/org.gnome.photos.gschema.xml
similarity index 54%
rename from data/org.gnome.photos.gschema.xml.in
rename to data/org.gnome.photos.gschema.xml
index 1eb35bf..7bbd903 100644
--- a/data/org.gnome.photos.gschema.xml.in
+++ b/data/org.gnome.photos.gschema.xml
@@ -2,18 +2,18 @@
   <schema id="org.gnome.photos" path="/org/gnome/photos/">
     <key name="window-size" type="ai">
       <default>[960, 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 094d766..dfb4839 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
 
 data/gnome-photos.appdata.xml.in
 data/gnome-photos.desktop.in.in
-data/org.gnome.photos.gschema.xml.in
+data/org.gnome.photos.gschema.xml
 src/eog-exif-util.c
 src/eog-image.c
 src/eog-uri-converter.c