[gnome-klotski] Rely on intltool >= 0.50 for gsettings translation

[Michael Catanzaro <mcatanzaro src gnome org>]

commit b0fc5515400a08db552bf87bb9fcd946d98a52a8
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Oct 5 13:51:37 2013 -0500

    Rely on intltool >= 0.50 for gsettings translation

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    9 +++------
 ...schema.xml.in => org.gnome.klotski.gschema.xml} |   12 ++++++------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2b722b9..c7af9e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50])
 AC_SUBST(GETTEXT_PACKAGE, gnome-klotski)
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index dcbd99c..7d26253 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,6 @@
 SUBDIRS = icons
 
-gsettings_in_file = org.gnome.klotski.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.klotski.gschema.xml
 @GSETTINGS_RULES@
 
 man_MANS = gnome-klotski.6
@@ -21,13 +19,12 @@ appdata_DATA = gnome-klotski.appdata.xml
 
 EXTRA_DIST = \
        $(appdata_DATA)         \
-       $(gsettings_in_file)    \
+       $(gsettings_SCHEMAS)    \
        $(desktop_in_files)     \
        $(man_MANS)             \
        $(pixmap_DATA)
 
-CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(gsettings_SCHEMAS)
+CLEANFILES = $(desktop_DATA)
 
 check-local: $(appdata_DATA) $(desktop_DATA)
        $(APPDATA_VALIDATE) $(appdata_DATA)
diff --git a/data/org.gnome.klotski.gschema.xml.in b/data/org.gnome.klotski.gschema.xml
similarity index 60%
rename from data/org.gnome.klotski.gschema.xml.in
rename to data/org.gnome.klotski.gschema.xml
index 73f8775..924c32f 100644
--- a/data/org.gnome.klotski.gschema.xml.in
+++ b/data/org.gnome.klotski.gschema.xml
@@ -2,24 +2,24 @@
   <schema id="org.gnome.klotski" path="/org/gnome/klotski/" gettext-domain="gnome-games">
     <key name="level" type="i">
       <default>0</default>
-      <_summary>The puzzle in play</_summary>
-      <_description>The number of the puzzle being played.</_description>
+      <summary>The puzzle in play</summary>
+      <description>The number of the puzzle being played.</description>
     </key>
     <key name="window-width" type="i">
       <default>600</default>
-      <_summary>Width of the window in pixels</_summary>
+      <summary>Width of the window in pixels</summary>
     </key>
     <key name="window-height" type="i">
       <default>400</default>
-      <_summary>Height of the window in pixels</_summary>
+      <summary>Height of the window in pixels</summary>
     </key>
     <key name="window-is-maximized" type="b">
       <default>false</default>
-      <_summary>true if the window is maximized</_summary>
+      <summary>true if the window is maximized</summary>
     </key>
     <key name="window-is-fullscreen" type="b">
       <default>false</default>
-      <_summary>true if the window is fullscren</_summary>
+      <summary>true if the window is fullscren</summary>
     </key>
   </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index aee03a5..d8c59ad 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,6 @@
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
 data/gnotski.desktop.in
-data/org.gnome.klotski.gschema.xml.in
+data/org.gnome.klotski.gschema.xml
 src/gnome-klotski.vala
 src/puzzle-view.vala