From: Matthias Klumpp <matthias@tenstral.net>
Date: Mon, 28 Aug 2017 23:36:39 +0000 (+0200)
Subject: Extend the AppData "language" to also support AppStream metainfo files.
X-Git-Tag: v0.20~451
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac5c1120096808a94bdeeb5319129d0d139a6d3a;p=thirdparty%2Fgettext.git

Extend the AppData "language" to also support AppStream metainfo files.

Fixes <https://savannah.gnu.org/bugs/?50414>,
reported by Piotr Drąg <piotrdrag@gmail.com>.

* gettext-tools/its/metainfo.its: Renamed from gettext-tools/its/appdata.its.
* gettext-tools/its/metainfo.loc: Renamed from gettext-tools/its/appdata.loc.
Recognize also suffix ".metainfo.xml".
* gettext-tools/its/Makefile.am (dist_its_DATA): Update.
* gettext-tools/src/x-appdata.h: Update comment.
---

diff --git a/gettext-tools/its/Makefile.am b/gettext-tools/its/Makefile.am
index 6e5a5ec08..ef17ae8c1 100644
--- a/gettext-tools/its/Makefile.am
+++ b/gettext-tools/its/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/its subdirectory of GNU gettext
-## Copyright (C) 2015-2016 Free Software Foundation, Inc.
+## Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,4 +21,4 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 pkgdatadir = $(datadir)/gettext
 itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its
 dist_its_DATA = glade.loc glade1.its glade2.its gtkbuilder.its \
-gsettings.loc gsettings.its appdata.loc appdata.its
+gsettings.loc gsettings.its metainfo.loc metainfo.its
diff --git a/gettext-tools/its/appdata.loc b/gettext-tools/its/appdata.loc
deleted file mode 100644
index 9bed6491c..000000000
--- a/gettext-tools/its/appdata.loc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<locatingRules>
-  <locatingRule name="AppData" pattern="*.appdata.xml">
-    <documentRule localName="component" target="appdata.its"/>
-  </locatingRule>
-</locatingRules>
diff --git a/gettext-tools/its/appdata.its b/gettext-tools/its/metainfo.its
similarity index 100%
rename from gettext-tools/its/appdata.its
rename to gettext-tools/its/metainfo.its
diff --git a/gettext-tools/its/metainfo.loc b/gettext-tools/its/metainfo.loc
new file mode 100644
index 000000000..0e471e6c2
--- /dev/null
+++ b/gettext-tools/its/metainfo.loc
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<locatingRules>
+  <locatingRule name="metainfo" pattern="*.metainfo.xml">
+    <documentRule localName="component" target="metainfo.its"/>
+  </locatingRule>
+  <locatingRule name="AppData" pattern="*.appdata.xml">
+    <documentRule localName="component" target="metainfo.its"/>
+  </locatingRule>
+</locatingRules>
diff --git a/gettext-tools/src/x-appdata.h b/gettext-tools/src/x-appdata.h
index a2e3ad446..b42c2d48c 100644
--- a/gettext-tools/src/x-appdata.h
+++ b/gettext-tools/src/x-appdata.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 
-/* The scanner is implemented as ITS rules, in its/appdata.its.  */
+/* The scanner is implemented as ITS rules, in its/metainfo.its.  */
 
 #define EXTENSIONS_APPDATA