[polari] build: intltool 0.50 add proper support for gsettings schemas



commit f188e2e9e2e20e4e075416902b5e1756895c1f7e
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Sep 12 00:21:23 2013 +0200

    build: intltool 0.50 add proper support for gsettings schemas
    
    Its not needed to use the .in hack anymore

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    8 ++------
 ...gschema.xml.in => org.gnome.polari.gschema.xml} |    0
 po/POTFILES.in                                     |    1 +
 4 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 658a835..5431ddc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AM_MAINTAINER_MODE([enable])
 
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
-IT_PROG_INTLTOOL(0.40.0)
+IT_PROG_INTLTOOL([0.50.0])
 
 GOBJECT_INTROSPECTION_REQUIRE([0.9.6])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index e1ed411..567dfe7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,21 +16,17 @@ polari.gresource: polari.gresource.xml $(resource_files)
 resourcedir=$(pkgdatadir)
 resource_DATA=polari.gresource
 
-gsettings_in_files = org.gnome.polari.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
-
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.polari.gschema.xml
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
        $(desktop_in_files) \
        polari.gresource.xml \
        $(resource_files) \
-       $(gsettings_in_files) \
+       $(gsettings_SCHEMAS) \
        $(NULL)
 
 CLEANFILES = \
        $(desktop_DATA) \
        $(resource_DATA) \
-       $(gsettings_SCHEMAS) \
        $(NULL)
diff --git a/data/org.gnome.polari.gschema.xml.in b/data/org.gnome.polari.gschema.xml
similarity index 100%
rename from data/org.gnome.polari.gschema.xml.in
rename to data/org.gnome.polari.gschema.xml
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 43a30bc..1b5fa4c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+data/org.gnome.polari.gschema.xml
 data/polari.desktop.in
 [type: gettext/glade]data/resources/app-menu.ui
 [type: gettext/glade]data/resources/connection-details-dialog.ui


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]