nm: Migrate appdata to metainfo

The path '/usr/share/appdata' is deprecated as is the .appdata.xml
extension, files should be in installed in '/usr/share/metainfo' with
a .metainfo.xml extension.

According to the docs, the metainfo path should be well supported even
by older distros like Ubuntu 16.04.

Reference: 2.1.2. Filesystem locations
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
This commit is contained in:
Tobias Brunner
2020-05-11 09:57:37 +02:00
parent ecf187509a
commit 73b60338dc
5 changed files with 12 additions and 12 deletions
+1 -1
View File
@@ -9,5 +9,5 @@ nm-strongswan-service.name
stamp-h1
config.guess.cdbs-orig
config.sub.cdbs-orig
NetworkManager-strongswan.appdata.xml
NetworkManager-strongswan.metainfo.xml
NetworkManager-strongswan.pot
+5 -5
View File
@@ -6,9 +6,9 @@ nmvpnservice_DATA = nm-strongswan-service.name
@INTLTOOL_DESKTOP_RULE@
appdatadir = $(datadir)/appdata
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = NetworkManager-strongswan.appdata.xml.in
metainfodir = $(datadir)/metainfo
metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
metainfo_in_files = NetworkManager-strongswan.metainfo.xml.in
@INTLTOOL_XML_RULE@
if WITH_LIBNM_GLIB
@@ -37,12 +37,12 @@ nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
EXTRA_DIST = \
nm-strongswan-service.name.in \
$(appdata_in_files) \
$(metainfo_in_files) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
CLEANFILES = $(nmvpnservice_DATA) $(appdata_DATA) *~
CLEANFILES = $(nmvpnservice_DATA) $(metainfo_DATA) *~
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
ACLOCAL_AMFLAGS = -I m4
+1 -1
View File
@@ -3,4 +3,4 @@
properties/nm-strongswan.c
[type: gettext/glade]properties/nm-strongswan-dialog.ui
auth-dialog/main.c
NetworkManager-strongswan.appdata.xml.in
NetworkManager-strongswan.metainfo.xml.in
+5 -5
View File
@@ -304,27 +304,27 @@ msgstr ""
"Die Konfiguration verwendet ssh-agent für die Authentisierung, aber ssh-"
"agent ist nicht gestartet!"
#: ../NetworkManager-strongswan.appdata.xml.in.h:1
#: ../NetworkManager-strongswan.metainfo.xml.in.h:1
msgid "strongSwan VPN client"
msgstr "strongSwan VPN Client"
#: ../NetworkManager-strongswan.appdata.xml.in.h:2
#: ../NetworkManager-strongswan.metainfo.xml.in.h:2
msgid "strongSwan based client for IPsec virtual private networks"
msgstr "Auf strongSwan basierender Client für IPsec VPNs"
#: ../NetworkManager-strongswan.appdata.xml.in.h:3
#: ../NetworkManager-strongswan.metainfo.xml.in.h:3
msgid ""
"Support for configuring IPsec based virtual private network connections."
msgstr ""
"Unterstützung für die Konfiguration von IPsec-basierten VPN Verbindungen."
#: ../NetworkManager-strongswan.appdata.xml.in.h:4
#: ../NetworkManager-strongswan.metainfo.xml.in.h:4
msgid ""
"Compatible with IKEv2 key exchange and multiple authentication mechanisms."
msgstr ""
"Kompatibel mit dem IKEv2 Schlüsselaustausch-Protokoll und verschiedenen "
"Authentisierungsmethoden."
#: ../NetworkManager-strongswan.appdata.xml.in.h:5
#: ../NetworkManager-strongswan.metainfo.xml.in.h:5
msgid "strongSwan Developers"
msgstr "strongSwan Entwickler"