[libgda/fix-appstream] Change dir for the appdata.xml to metainfo



commit 4b005b2ae8d3553762eda1f31e7bbcfc387b0636
Author: Rafael Fontenelle <rafaelff gnome org>
Date:   Wed Jan 16 11:06:59 2019 -0200

    Change dir for the appdata.xml to metainfo
    
    The default directory for the appdata xml file changed from
    'appdata' to 'metainfo' in the AppStream 0.12 specification

 control-center/Makefile.am | 10 +++++-----
 tools/browser/Makefile.am  | 10 +++++-----
 tools/browser/meson.build  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index ca11f681a..799fee911 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -69,9 +69,9 @@ appicons_DATA= \
        gda-control-center.png
 
 @INTLTOOL_XML_RULE@
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = gda-control-center-6.0.appdata.xml.in
+metainfodir = $(datadir)/metainfo
+metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
+metainfo_in_files = gda-control-center-6.0.appdata.xml.in
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir=$(datadir)/applications
@@ -82,12 +82,12 @@ EXTRA_DIST = \
        $(RESOURCES) \
        control-center-res.rc \
        gda-control-center.ico \
-       $(appdata_in_files) \
+       $(metainfo_in_files) \
        $(Desktop_in_files)
 
 DISTCLEANFILES = \
        $(desktop_DATA) \
-       $(appdata_DATA)
+       $(metainfo_DATA)
 
 CLEANFILES = \
        control-center.gresources.c
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 665870528..1fe1ac6e1 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -88,9 +88,9 @@ appicons_DATA= \
        data/256x256/gda-browser-6.0.png
 
 @INTLTOOL_XML_RULE@
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = gda-browser-6.0.appdata.xml.in
+metainfodir = $(datadir)/metainfo
+metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
+metainfo_in_files = gda-browser-6.0.appdata.xml.in
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir=$(datadir)/applications
@@ -100,11 +100,11 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 EXTRA_DIST = \
        browser-marshal.list \
        $(Desktop_in_files) \
-       $(appdata_in_files) \
+       $(metainfo_in_files) \
        $(appicons_DATA)
 
 DISTCLEANFILES = \
        $(desktop_DATA) \
        gda-browser-6.0.desktop.in \
-       $(appdata_DATA)
+       $(metainfo_DATA)
 
diff --git a/tools/browser/meson.build b/tools/browser/meson.build
index 20a22897a..6b6ca1792 100644
--- a/tools/browser/meson.build
+++ b/tools/browser/meson.build
@@ -105,7 +105,7 @@ custom_target('gda-browser-6.0.appdata',
                input: 'gda-browser-6.0.appdata.xml.in',
                output: 'gda-browser-6.0.appdata.xml',
                install: true,
-               install_dir: join_paths(get_option('datadir'),'appdata')
+               install_dir: join_paths(get_option('datadir'),'metainfo')
                )
 
 browser_deps += inc_browserdirh_dep


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