Merge branch 'appdata' into 'master'

Move appdata check to makefile and use sm.puri

See merge request librem5-apps/librem5-goodies!16

Makefile

@@ -1,2 +1,13 @@
-all:
+APPDATA = \
+  sm.puri.librem5.goodies.appdata.xml \
+  $(NULL)
+
+all: shell-check appstream-check
+
+shell-check:
 	shellcheck l5-contacts-importer l5-screenshot l5-scale-the-screen
+
+appstream-check:
+	appstream-util validate-relax $(APPDATA)
+
+.PHONY: all shell-check appstream-check

debian/control

@@ -3,6 +3,7 @@ Section: comm
 Priority: optional
 Maintainer: João Azevedo <joao.azevedo@puri.sm>
 Build-Depends:
+ appstream-util,
  debhelper-compat (= 12),
  shellcheck,
 Homepage: https://source.puri.sm/librem5-apps/librem5-goodies

debian/librem5-goodies.install

@@ -4,4 +4,4 @@ l5-screenshot /usr/bin
 l5-screenshot.desktop /usr/share/applications
 l5-scale-the-screen /usr/bin
 l5-scale-the-screen.desktop /usr/share/applications
-org.librem5.goodies.appdata.xml /usr/share/metainfo
+sm.puri.librem5.goodies.appdata.xml /usr/share/metainfo

debian/rules

@@ -6,5 +6,3 @@
 override_dh_auto_test:
 	make
 
-dh_command:
-	appstream-util validate-relax org.librem5.goodies.appdata.xml

sm.puri.librem5.goodies.appdata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2018-2019 Purism, SPC -->
 <component type="desktop-application">
-  <id>org.librem5.goodies</id>
+  <id>sm.puri.librem5.goodies</id>
   <metadata_license>gpl-3+</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>Librem 5 Goodies</name>