From ee2a783223fc9be7135505535f67ade84d984940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
Date: Fri, 28 Dec 2018 21:35:06 +0100
Subject: [PATCH] Update AppStream metadata to a newer version

---
 data/Makefile.am                |  2 +-
 data/guvcview.appdata.xml.in.in | 29 ++++++++++++++++++++---------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 22055f0..ad14d10 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,7 +28,7 @@ desktop_DATA = $(DESKTOP_FILES)
 APPDATA_IN_FILES= guvcview.appdata.xml.in
 APPDATA_FILES= $(APPDATA_IN_FILES:.xml.in=.xml)
 
-appdatadir = $(datadir)/appdata
+appdatadir = $(datadir)/metainfo
 appdata_DATA = $(APPDATA_FILES)
 
 endif
diff --git a/data/guvcview.appdata.xml.in.in b/data/guvcview.appdata.xml.in.in
index 61ba8c3..de934f7 100644
--- a/data/guvcview.appdata.xml.in.in
+++ b/data/guvcview.appdata.xml.in.in
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Paulo Assis <pj.assis@gmail.com> -->
-<application>
- <id type="desktop">guvcview.desktop</id>
+<component type="desktop-application">
+ <id>net.sourceforge.guvcview</id>
+ <launchable type="desktop-id">guvcview.desktop</launchable>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>Simple UVC Viewer</name>
@@ -16,12 +17,22 @@
      that is compatible with any other v4l2 app.</_p>
  </description>
  <screenshots>
-  <screenshot>https://sourceforge.net/p/guvcview/screenshot/guvcview_image_tab.png</screenshot>
-  <screenshot>https://sourceforge.net/p/guvcview/screenshot/guvcview_h264_tab.png</screenshot>
-  <screenshot>https://sourceforge.net/p/guvcview/screenshot/guvcview_video_tab.png</screenshot>
-  <screenshot>https://sourceforge.net/p/guvcview/screenshot/guvcview_audio_tab.png</screenshot>
-  <screenshot>https://a.fsdn.com/con/app/proj/guvcview/screenshots/guvcview_video_preview.png</screenshot>
+  <screenshot>
+   <image>https://sourceforge.net/p/guvcview/screenshot/guvcview_image_tab.png</image>
+  </screenshot>
+  <screenshot>
+   <image>https://sourceforge.net/p/guvcview/screenshot/guvcview_h264_tab.png</image>
+  </screenshot>
+  <screenshot>
+   <image>https://sourceforge.net/p/guvcview/screenshot/guvcview_video_tab.png</image>
+  </screenshot>
+  <screenshot>
+   <image>https://sourceforge.net/p/guvcview/screenshot/guvcview_audio_tab.png</image>
+  </screenshot>
+  <screenshot>
+   <image>https://a.fsdn.com/con/app/proj/guvcview/screenshots/guvcview_video_preview.png</image>
+  </screenshot>
  </screenshots>
  <url type="homepage">http://guvcview.sourceforge.net/</url>
- <updatecontact>assisp@gmail.com</updatecontact>
-</application>
+ <update_contact>assisp@gmail.com</update_contact>
+</component>
-- 
2.20.1