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

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 0ef155b91c4fe5ce2227e7a1592fd0f0949e0362
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Oct 5 15:18:34 2013 -0500

    Rely on intltool >=0.50 for gsettings translation

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    9 ++---
 ....gschema.xml.in => org.gnome.mines.gschema.xml} |   34 ++++++++++----------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 22 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 63b2955..0d7e37a 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-mines)
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index b2a60c7..d956aee 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,6 @@
 SUBDIRS = icons
 
-gsettings_in_file = org.gnome.mines.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.mines.gschema.xml
 @GSETTINGS_RULES@
 
 man_MANS = gnome-mines.6
@@ -22,13 +20,12 @@ appdata_DATA = gnome-mines.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.mines.gschema.xml.in b/data/org.gnome.mines.gschema.xml
similarity index 56%
rename from data/org.gnome.mines.gschema.xml.in
rename to data/org.gnome.mines.gschema.xml
index 379e520..ac3235f 100644
--- a/data/org.gnome.mines.gschema.xml.in
+++ b/data/org.gnome.mines.gschema.xml
@@ -2,18 +2,18 @@
   <schema id="org.gnome.mines" path="/org/gnome/mines/" gettext-domain="gnome-games">
     <key name="use-question-marks" type="b">
       <default>false</default>
-      <_summary>Use the unknown flag</_summary>
-      <_description>Set to true to be able to mark squares as unknown.</_description>
+      <summary>Use the unknown flag</summary>
+      <description>Set to true to be able to mark squares as unknown.</description>
     </key>
     <key name="use-overmine-warning" type="b">
       <default>false</default>
-      <_summary>Warning about too many flags</_summary>
-      <_description>Set to true to enable warning icons when too many flags are placed.</_description>
+      <summary>Warning about too many flags</summary>
+      <description>Set to true to enable warning icons when too many flags are placed.</description>
     </key>
     <key name="use-number-border" type="b">
       <default>false</default>
-      <_summary>Display border around numbers</_summary>
-      <_description>Set to true to display a border around mine indication numbers.</_description>
+      <summary>Display border around numbers</summary>
+      <description>Set to true to display a border around mine indication numbers.</description>
     </key>
     <key type="b" name="use-newgame-confirm">
       <default>false</default>
@@ -23,44 +23,44 @@
     </key>
     <key name="use-autoflag" type="b">
       <default>false</default>
-      <_summary>Enable automatic placing of flags</_summary>
-      <_description>Set to true to automatically flag squares as mined when enough squares are 
revealed</_description>
+      <summary>Enable automatic placing of flags</summary>
+      <description>Set to true to automatically flag squares as mined when enough squares are 
revealed</description>
     </key>
     <key name="xsize" type="i">
       <default>16</default>
       <range min="4" max="100" />
-      <_summary>Number of columns in a custom game</_summary>
+      <summary>Number of columns in a custom game</summary>
     </key>
     <key name="ysize" type="i">
       <default>16</default>
       <range min="4" max="100" />
-      <_summary>Number of rows in a custom game</_summary>
+      <summary>Number of rows in a custom game</summary>
     </key>
     <key name="nmines" type="i">
       <default>40</default>
-      <_summary>The number of mines in a custom game</_summary>
+      <summary>The number of mines in a custom game</summary>
     </key>
     <key name="mode" type="i">
       <default>0</default>
       <range min="0" max="3" />
-      <_summary>Board size</_summary>
-      <_description>Size of the board (0-2 = small-large, 3=custom)</_description>
+      <summary>Board size</summary>
+      <description>Size of the board (0-2 = small-large, 3=custom)</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 ada035d..21e5ae5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
 data/gnomine.desktop.in
-data/org.gnome.mines.gschema.xml.in
+data/org.gnome.mines.gschema.xml
 src/gnome-mines.vala
 src/history.vala
 src/minefield.vala