[libgweather] build> intltool 0.50 properly support gsetting schemas

[Javier JardÃn <jjardon src gnome org>]

commit a6d3b5782dfb09d264e741e272be992df83c1137
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Mar 26 18:38:12 2012 +0100

    build> intltool 0.50 properly support gsetting schemas

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    3 +-
 ...chema.xml.in => org.gnome.GWeather.gschema.xml} |   46 ++++++++++----------
 3 files changed, 25 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fa46084..acbfe40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ LT_PREREQ([2.2.6])
 LT_INIT([dlopen win32-dll disable-static])
 LT_LIB_M
 
-IT_PROG_INTLTOOL([0.40.6])
+IT_PROG_INTLTOOL([0.50.0])
 PKG_PROG_PKG_CONFIG([0.19])
 
 AC_PROG_CC
diff --git a/data/Makefile.am b/data/Makefile.am
index 309b457..173aab4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -68,19 +68,18 @@ gsettings_ENUM_NAMESPACE = org.gnome.GWeather
 gsettings_ENUM_FILES = $(top_srcdir)/libgweather/gweather-enums.h
 
 gsettings_SCHEMAS = org.gnome.GWeather.gschema.xml
- INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST =	\
 	$(libgweatherlocations_in_files)	\
 	$(libgweatherdtd_DATA)			\
+	$(gsettings_SCHEMAS)			\
 	check-timezones.sh			\
 	README					\
 	README.timezones
 
 CLEANFILES =	\
 	$(libgweatherlocations_DATA)		\
-	$(gsettings_SCHEMAS)			\
 	*.valid					\
 	$(LOCATIONS_STAMP)
 
diff --git a/data/org.gnome.GWeather.gschema.xml.in b/data/org.gnome.GWeather.gschema.xml
similarity index 77%
rename from data/org.gnome.GWeather.gschema.xml.in
rename to data/org.gnome.GWeather.gschema.xml
index a8582a7..96d7d70 100644
--- a/data/org.gnome.GWeather.gschema.xml.in
+++ b/data/org.gnome.GWeather.gschema.xml
@@ -2,62 +2,62 @@
   <schema id="org.gnome.GWeather" path="/org/gnome/GWeather/">
     <key name="radar" type="s">
       <default>''</default>
-      <_summary>URL for the radar map</_summary>
-      <_description>
+      <summary>URL for the radar map</summary>
+      <description>
 	The custom URL from where to retrieve a radar map, or empty
 	for disabling radar maps.
-      </_description>
+      </description>
     </key>
     <key name="temperature-unit" enum="org.gnome.GWeather.GWeatherTemperatureUnit">
       <!-- TRANSLATORS: pick a temperature unit that should be used by default in your
       locale; values must be quoted -->
-      <_default l10n="messages">'fahrenheit'</_default>
-      <_summary>Temperature unit</_summary>
-      <_description>
+      <default l10n="messages">'fahrenheit'</default>
+      <summary>Temperature unit</summary>
+      <description>
 	The unit of temperature used for showing weather. Valid values are 'kelvin',
 	'centigrade' and 'fahrenheit'.
-      </_description>
+      </description>
     </key>
     <key name="distance-unit" enum="org.gnome.GWeather.GWeatherDistanceUnit">
       <!-- TRANSLATORS: pick a default distance unit for your locale, see key description
       for valid values -->
-      <_default l10n="messages">'miles'</_default>
-      <_summary>Distance unit</_summary>
-      <_description>
+      <default l10n="messages">'miles'</default>
+      <summary>Distance unit</summary>
+      <description>
 	The unit of distance used for showing weather (for example for visibility or for
 	distance of important events). Valid values are 'meters', 'km' and 'miles'.
-      </_description>
+      </description>
     </key>
     <key name="speed-unit" enum="org.gnome.GWeather.GWeatherSpeedUnit">
       <!-- TRANSLATORS: pick a default speed unit for your locale, see key description
       for valid values -->
-      <_default l10n="messages">'knots'</_default>
-      <_summary>Speed unit</_summary>
-      <_description>
+      <default l10n="messages">'knots'</default>
+      <summary>Speed unit</summary>
+      <description>
 	The unit of speed used for showing weather (for example for wind speed). Valid
 	values are 'ms' (meters per second), 'kph' (kilometers per hour), 'mph' (miles
 	per hour), 'knots' and 'bft' (Beaufort scale).
-      </_description>
+      </description>
     </key>
     <key name="pressure-unit" enum="org.gnome.GWeather.GWeatherPressureUnit">
       <!-- TRANSLATORS: pick a default pressure unit for your locale, see key description
       for valid values -->
-      <_default l10n="messages">'inch-hg'</_default>
-      <_summary>Pressure unit</_summary>
-      <_description>
+      <default l10n="messages">'inch-hg'</default>
+      <summary>Pressure unit</summary>
+      <description>
 	The unit of pressure used for showing weather. Valid values are 'kpa' (kilopascal),
 	'hpa' (hectopascal), 'mb' (millibar, mathematically equivalent to 1 hPa but shown
 	differently), 'mm-hg' (millimiters of mercury), 'inch-hg' (inches of mercury), 'atm'
 	(atmospheres).
-      </_description>
+      </description>
     </key>
     <key name="default-location" type="(ssm(dd))">
       <!-- TRANSLATORS: pick a default location to use in the weather applet. This should
       usually be the largest city or the capital of your country. If you're not picking
       a <location> in the database, don't forget to set name and coordinates. -->
-      <_default>('', 'KNYC', nothing)</_default>
-      <_summary>Default location</_summary>
-      <_description>
+      <default>('', 'KNYC', nothing)</default>
+      <summary>Default location</summary>
+      <description>
 	The default location for the weather applet. The first field is the name that will
 	be shown. If empty, it will be taken from the locations database.
 	The second field is the METAR code for the default weather station. It must not be
@@ -65,7 +65,7 @@
 	The third field is a tuple of (latitude, longitude), to override the value taken
 	from the database. This is only used for sunrise and moon phase calculations, not
 	for weather forecast.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>