[gnome-tetravex] Rely on intltool >=0.50 for gsettings translations

[Michael Catanzaro <mcatanzaro src gnome org>]

commit b4729ca5a050486c74d6b092552a4adae16dfb23
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Oct 6 10:41:25 2013 -0500

    Rely on intltool >=0.50 for gsettings translations

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    9 +++------
 ...chema.xml.in => org.gnome.tetravex.gschema.xml} |   12 ++++++------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 76a809e..6f16694 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-tetravex)
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index 22f1a83..1d1ed96 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,9 +11,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 appdatadir = $(datadir)/appdata
 appdata_DATA = gnome-tetravex.appdata.xml
 
-gsettings_in_file = org.gnome.tetravex.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.tetravex.gschema.xml
 @GSETTINGS_RULES@
 
 man_MANS = gnome-tetravex.6
@@ -22,11 +20,10 @@ EXTRA_DIST = \
        $(appdata_DATA) \
        $(desktop_in_files) \
        $(ui_DATA) \
-       $(gsettings_in_file) \
+       $(gsettings_SCHEMAS) \
        $(man_MANS)
     
-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.tetravex.gschema.xml.in b/data/org.gnome.tetravex.gschema.xml
similarity index 59%
rename from data/org.gnome.tetravex.gschema.xml.in
rename to data/org.gnome.tetravex.gschema.xml
index 8850101..ae6ea08 100644
--- a/data/org.gnome.tetravex.gschema.xml.in
+++ b/data/org.gnome.tetravex.gschema.xml
@@ -3,24 +3,24 @@
     <key name="grid-size" type="i">
       <default>3</default>
       <range min="2" max="6" />
-      <_summary>The size of the playing grid</_summary>
-      <_description>The value of this key is used to decide the size of the playing grid.</_description>
+      <summary>The size of the playing grid</summary>
+      <description>The value of this key is used to decide the size of the playing grid.</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 ed7746c..668fbe5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
 [encoding: UTF-8]
 data/gnome-tetravex.desktop.in
 [type: gettext/glade]data/gnome-tetravex.ui
-data/org.gnome.tetravex.gschema.xml.in
+data/org.gnome.tetravex.gschema.xml
 src/gnome-tetravex.vala
 src/puzzle.vala
 src/puzzle-view.vala