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

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 41f8f20447de8d36ea59c7abccf47791984ee269
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Oct 5 15:03:29 2013 -0500

    Rely on intltool >=0.50 for gsettings translations

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    9 +++------
 ...xml.in => org.gnome.gnome-mahjongg.gschema.xml} |   17 ++++-------------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 9 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1dc3fc3..74ad30c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50])
 AC_SUBST(GETTEXT_PACKAGE, gnome-mahjongg)
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index 0c54d6a..5362480 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,9 +14,7 @@ theme_DATA = \
        seta.png        \
        smooth.png
 
-gsettings_in_file = org.gnome.gnome-mahjongg.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.gnome-mahjongg.gschema.xml
 @GSETTINGS_RULES@
 
 man_MANS = gnome-mahjongg.6
@@ -33,13 +31,12 @@ EXTRA_DIST = \
        $(appdata_DATA)         \
        $(desktop_in_files)     \
        $(theme_DATA)           \
-       $(gsettings_in_file)    \
+       $(gsettings_SCHEMAS)    \
        $(man_MANS)     \
        $(map_DATA)             \
        translatable_game_names.h
 
-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.gnome-mahjongg.gschema.xml.in b/data/org.gnome.gnome-mahjongg.gschema.xml
similarity index 76%
rename from data/org.gnome.gnome-mahjongg.gschema.xml.in
rename to data/org.gnome.gnome-mahjongg.gschema.xml
index d8c106e..1cacfb9 100644
--- a/data/org.gnome.gnome-mahjongg.gschema.xml.in
+++ b/data/org.gnome.gnome-mahjongg.gschema.xml
@@ -1,41 +1,32 @@
 <schemalist>
   <schema id="org.gnome.gnome-mahjongg" path="/org/gnome/gnome-mahjongg/" gettext-domain="gnome-games">
-
     <key name="show-toolbar" type="b">
       <default>true</default>
     </key>
-
     <key name="tileset" type="s">
       <default>"postmodern.svg"</default>
     </key>
-
     <key name="mapset" type="s">
       <default>"Easy"</default>
     </key>
-
     <key name="bgcolour" type="s">
       <default>"#34385b"</default>
     </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 0f6a3ce..b42f8ae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
 data/mahjongg.desktop.in
-data/org.gnome.gnome-mahjongg.gschema.xml.in
+data/org.gnome.gnome-mahjongg.gschema.xml
 data/translatable_game_names.h
 src/game.vala
 src/game-view.vala