[swell-foop] Rely on intltool >=0.50 for gsettings translations

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 86d2558d1bd016f165cd5ac5d3091c9fb64021ff
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Oct 6 10:09:46 2013 -0500

    Rely on intltool >=0.50 for gsettings translations

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |   13 +++----------
 ...ema.xml.in => org.gnome.swell-foop.gschema.xml} |   16 ++++++++--------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 13 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fc4941f..ecf0a20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50])
 AC_SUBST(GETTEXT_PACKAGE, swell-foop)
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index 9c90649..cde426b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,6 @@
 SUBDIRS = icons themes
 
-gsettings_in_file = org.gnome.swell-foop.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.swell-foop.gschema.xml
 @GSETTINGS_RULES@
 
 swelldir=$(datadir)/swell-foop
@@ -20,16 +18,11 @@ appdata_DATA = swell-foop.appdata.xml
 EXTRA_DIST = \
     $(appdata_DATA) \
     $(swell_DATA) \
-    $(gsettings_in_file) \
+    $(gsettings_SCHEMAS) \
     $(desktop_in_files)
 
 CLEANFILES = \
-       $(desktop_DATA) \
-       $(gsettings_SCHEMAS)
-
-DISTCLEANFILES = $(gsettings_SCHEMAS)
-
- INTLTOOL_SCHEMAS_RULE@
+       $(desktop_DATA)
 
 check-local: $(appdata_DATA) $(desktop_DATA)
        $(APPDATA_VALIDATE) $(appdata_DATA)
diff --git a/data/org.gnome.swell-foop.gschema.xml.in b/data/org.gnome.swell-foop.gschema.xml
similarity index 57%
rename from data/org.gnome.swell-foop.gschema.xml.in
rename to data/org.gnome.swell-foop.gschema.xml
index f0111b7..f8bb6e7 100644
--- a/data/org.gnome.swell-foop.gschema.xml.in
+++ b/data/org.gnome.swell-foop.gschema.xml
@@ -7,23 +7,23 @@
   <schema id="org.gnome.swell-foop" path="/org/gnome/swell-foop/" gettext-domain="gnome-games">
     <key name="theme" type="s">
       <default>'shapesandcolors'</default>
-      <_summary>The theme to use</_summary>
-      <_description>The title of the tile theme to use.</_description>
+      <summary>The theme to use</summary>
+      <description>The title of the tile theme to use.</description>
     </key>
     <key name="size" enum="org.gnome.swell-foop.Sizes">
       <default>'small'</default>
-      <_summary>Board size</_summary>
-      <_description>The size of the game board.</_description>
+      <summary>Board size</summary>
+      <description>The size of the game board.</description>
     </key>
     <key name="colors" type="i">
       <default>3</default>
-      <_summary>Board color count</_summary>
-      <_description>The number of colors of tiles to use in the game.</_description>
+      <summary>Board color count</summary>
+      <description>The number of colors of tiles to use in the game.</description>
     </key>
     <key name="zealous" type="b">
       <default>true</default>
-      <_summary>Zealous animation</_summary>
-      <_description>Use more flashy, but slower, animations.</_description>
+      <summary>Zealous animation</summary>
+      <description>Use more flashy, but slower, animations.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 37cf4e8..3aa2f1a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
-data/org.gnome.swell-foop.gschema.xml.in
+data/org.gnome.swell-foop.gschema.xml
 [type: gettext/glade]data/preferences.ui
 data/swell-foop.desktop.in
 src/game.vala