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

diff --git a/src/frontends/gnome/.gitignore b/src/frontends/gnome/.gitignore
index 38b1b30..386bd1e 100644 (file)
--- a/src/frontends/gnome/.gitignore
+++ b/src/frontends/gnome/.gitignore
@@ -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

diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index 9b8c676..646d913 100644 (file)
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -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

diff --git a/src/frontends/gnome/NetworkManager-strongswan.appdata.xml.in b/src/frontends/gnome/NetworkManager-strongswan.appdata.xml.in
deleted file mode 100644 (file)
index e2b8998..0000000
--- a/src/frontends/gnome/NetworkManager-strongswan.appdata.xml.in
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright Lubomir Rintel 2016 -->
-<component type="addon">
-  <id>network-manager-strongswan</id>
-  <project_license>GPL-2.0+</project_license>
-  <metadata_license>CC0-1.0</metadata_license>
-  <extends>nm-connection-editor.desktop</extends>
-  <extends>gnome-control-center.desktop</extends>
-  <_name>strongSwan VPN client</_name>
-  <_summary>strongSwan based client for IPsec virtual private networks</_summary>
-
-  <keywords>
-    <keyword>network</keyword>
-    <keyword>manager</keyword>
-    <keyword>NetworkManager</keyword>
-    <keyword>connection</keyword>
-    <keyword>VPN</keyword>
-    <keyword>strongSwan</keyword>
-    <keyword>IPsec</keyword>
-    <keyword>IKEv2</keyword>
-  </keywords>
-
-  <description>
-    <_p>Support for configuring IPsec based virtual private network connections.</_p>
-    <_p>Compatible with IKEv2 key exchange and multiple authentication mechanisms.</_p>
-  </description>
-
-  <screenshots>
-    <screenshot type="default">
-      <image width="800" height="682">https://www.strongswan.org/images/networkmanager-plugin-eap.png</image>
-    </screenshot>
-  </screenshots>
-
-  <url type="homepage">https://wiki.strongswan.org/projects/strongswan/wiki/NetworkManager</url>
-  <url type="bugtracker">https://wiki.strongswan.org/projects/strongswan/wiki/FlawReporting</url>
-  <url type="help">https://www.strongswan.org/support.html</url>
-  <update_contact>info_AT_strongswan.org</update_contact>
-  <translation type="gettext">NetworkManager-strongswan</translation>
-  <_developer_name>strongSwan Developers</_developer_name>
-</component>

diff --git a/src/frontends/gnome/NetworkManager-strongswan.metainfo.xml.in b/src/frontends/gnome/NetworkManager-strongswan.metainfo.xml.in
new file mode 100644 (file)
index 0000000..e2b8998
--- /dev/null
+++ b/src/frontends/gnome/NetworkManager-strongswan.metainfo.xml.in
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright Lubomir Rintel 2016 -->
+<component type="addon">
+  <id>network-manager-strongswan</id>
+  <project_license>GPL-2.0+</project_license>
+  <metadata_license>CC0-1.0</metadata_license>
+  <extends>nm-connection-editor.desktop</extends>
+  <extends>gnome-control-center.desktop</extends>
+  <_name>strongSwan VPN client</_name>
+  <_summary>strongSwan based client for IPsec virtual private networks</_summary>
+
+  <keywords>
+    <keyword>network</keyword>
+    <keyword>manager</keyword>
+    <keyword>NetworkManager</keyword>
+    <keyword>connection</keyword>
+    <keyword>VPN</keyword>
+    <keyword>strongSwan</keyword>
+    <keyword>IPsec</keyword>
+    <keyword>IKEv2</keyword>
+  </keywords>
+
+  <description>
+    <_p>Support for configuring IPsec based virtual private network connections.</_p>
+    <_p>Compatible with IKEv2 key exchange and multiple authentication mechanisms.</_p>
+  </description>
+
+  <screenshots>
+    <screenshot type="default">
+      <image width="800" height="682">https://www.strongswan.org/images/networkmanager-plugin-eap.png</image>
+    </screenshot>
+  </screenshots>
+
+  <url type="homepage">https://wiki.strongswan.org/projects/strongswan/wiki/NetworkManager</url>
+  <url type="bugtracker">https://wiki.strongswan.org/projects/strongswan/wiki/FlawReporting</url>
+  <url type="help">https://www.strongswan.org/support.html</url>
+  <update_contact>info_AT_strongswan.org</update_contact>
+  <translation type="gettext">NetworkManager-strongswan</translation>
+  <_developer_name>strongSwan Developers</_developer_name>
+</component>

diff --git a/src/frontends/gnome/po/POTFILES.in b/src/frontends/gnome/po/POTFILES.in
index 8c56a13..1b05c10 100644 (file)
--- a/src/frontends/gnome/po/POTFILES.in
+++ b/src/frontends/gnome/po/POTFILES.in
@@ -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

diff --git a/src/frontends/gnome/po/de.po b/src/frontends/gnome/po/de.po
index 91486fa..544546a 100644 (file)
--- a/src/frontends/gnome/po/de.po
+++ b/src/frontends/gnome/po/de.po
@@ -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"