[gnome-documents] build: Fix AppStream metainfo file name
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-documents] build: Fix AppStream metainfo file name
- Date: Thu, 7 Dec 2017 13:58:58 +0000 (UTC)
commit 532792a95060fc4a8dcc8bdda063b7752f8ee23e
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Wed Oct 11 11:45:12 2017 +0200
build: Fix AppStream metainfo file name
Applications are a special case when naming metainfo files and
they have to be named as %{id}.appdata.xml, but installed in
$(datadir)/metainfo.
Fallout from 71403a65fbe6e82db7755cc5f64b1201adcf5c16
https://bugzilla.gnome.org/show_bug.cgi?id=787013
data/Makefile.am | 8 ++++----
data/meson.build | 14 +++++++-------
...ainfo.xml.in => org.gnome.Books.appdata.xml.in} | 0
...o.xml.in => org.gnome.Documents.appdata.xml.in} | 0
po/POTFILES.in | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 5043886..3c79b87 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -24,13 +24,13 @@ resource_DATA = org.gnome.Documents.data.gresource org.gnome.Books.data.gresourc
metainfodir = $(datadir)/metainfo
metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
metainfo_in_files = \
- org.gnome.Documents.metainfo.xml.in \
- org.gnome.Books.metainfo.xml.in
+ org.gnome.Documents.appdata.xml.in \
+ org.gnome.Books.appdata.xml.in
-org.gnome.Books.metainfo.xml: org.gnome.Books.metainfo.xml.in
+org.gnome.Books.appdata.xml: org.gnome.Books.appdata.xml.in
$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
-org.gnome.Documents.metainfo.xml: org.gnome.Documents.metainfo.xml.in
+org.gnome.Documents.appdata.xml: org.gnome.Documents.appdata.xml.in
$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
desktopdir = $(datadir)/applications
diff --git a/data/meson.build b/data/meson.build
index a9c10a9..d6bcce5 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -54,16 +54,16 @@ foreach resource: resources
)
endforeach
-infos = [
- 'org.gnome.Books.metainfo.xml',
- 'org.gnome.Documents.metainfo.xml'
+appdatas = [
+ 'org.gnome.Books.appdata.xml',
+ 'org.gnome.Documents.appdata.xml'
]
-foreach info: infos
+foreach appdata: appdatas
i18n.merge_file(
- info,
- input: info + '.in',
- output: info,
+ appdata,
+ input: appdata + '.in',
+ output: appdata,
po_dir: po_dir,
install: true,
install_dir: join_paths(documents_datadir, 'metainfo')
diff --git a/data/org.gnome.Books.metainfo.xml.in b/data/org.gnome.Books.appdata.xml.in
similarity index 100%
rename from data/org.gnome.Books.metainfo.xml.in
rename to data/org.gnome.Books.appdata.xml.in
diff --git a/data/org.gnome.Documents.metainfo.xml.in b/data/org.gnome.Documents.appdata.xml.in
similarity index 100%
rename from data/org.gnome.Documents.metainfo.xml.in
rename to data/org.gnome.Documents.appdata.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 73d9aaa..a0257de 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,9 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
-data/org.gnome.Books.metainfo.xml.in
+data/org.gnome.Books.appdata.xml.in
data/org.gnome.Books.desktop.in
data/org.gnome.books.gschema.xml
-data/org.gnome.Documents.metainfo.xml.in
+data/org.gnome.Documents.appdata.xml.in
data/org.gnome.Documents.desktop.in
data/org.gnome.documents.gschema.xml
data/ui/app-menu.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]