From 4861ca2f96a63c63e98abf39601c0a656779aef9 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Tue, 31 Mar 2020 16:40:23 +0200
Subject: Use app_id for appstream data

---
 data/meson.build                             |  4 ++--
 data/org.gnome.PrepaidManager.appdata.xml.in | 20 ++++++++++++++++++++
 data/prepaid-manager-applet.appdata.xml.in   | 20 --------------------
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 data/org.gnome.PrepaidManager.appdata.xml.in
 delete mode 100644 data/prepaid-manager-applet.appdata.xml.in

diff --git a/data/meson.build b/data/meson.build
index 797f6f4..0f55aea 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -18,8 +18,8 @@ install_data(
 )
 
 appstream_file = i18n.merge_file(
-  input: 'prepaid-manager-applet.appdata.xml.in',
-  output: 'prepaid-manager-applet.appdata.xml',
+  input: app_id + '.appdata.xml.in',
+  output: app_id + '.appdata.xml',
   po_dir: '../po',
   install: true,
   install_dir: join_paths(get_option('datadir'), 'appdata')
diff --git a/data/org.gnome.PrepaidManager.appdata.xml.in b/data/org.gnome.PrepaidManager.appdata.xml.in
new file mode 100644
index 0000000..e6b5aa2
--- /dev/null
+++ b/data/org.gnome.PrepaidManager.appdata.xml.in
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>org.gnome.PrepaidManager</id>
+    <metadata_license>CC-BY-SA-3.0</metadata_license>
+    <project_license>GPL-3.0-or-later</project_license>
+    <name>Prepaid manager</name>
+    <description>
+      GNOME Prepaid-manager-applet is an applet for the GNOME Desktop that
+      allows you to check and top up the balance of GSM mobile prepaid SIM cards.
+
+      It uses ModemManager to talk to the modem and mobile-broadband-provider-info
+      to determine the necessary USSD codes for your provider.
+    </description>
+    <url type="homepage">https://honk.sigxcpu.org/piki/projects/ppm/</url>
+    <updatecontact>agx@sigxcpu.org</updatecontact>
+    <screenshots>
+      <screenshot type="default" width="411" height="183">https://honk.sigxcpu.org/piki/projects/ppm/check.png</screenshot>
+      <screenshot width="411" height="183">https://honk.sigxcpu.org/piki/projects/ppm/topup.png</screenshot>
+    </screenshots>
+</component>
diff --git a/data/prepaid-manager-applet.appdata.xml.in b/data/prepaid-manager-applet.appdata.xml.in
deleted file mode 100644
index e6b5aa2..0000000
--- a/data/prepaid-manager-applet.appdata.xml.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-    <id>org.gnome.PrepaidManager</id>
-    <metadata_license>CC-BY-SA-3.0</metadata_license>
-    <project_license>GPL-3.0-or-later</project_license>
-    <name>Prepaid manager</name>
-    <description>
-      GNOME Prepaid-manager-applet is an applet for the GNOME Desktop that
-      allows you to check and top up the balance of GSM mobile prepaid SIM cards.
-
-      It uses ModemManager to talk to the modem and mobile-broadband-provider-info
-      to determine the necessary USSD codes for your provider.
-    </description>
-    <url type="homepage">https://honk.sigxcpu.org/piki/projects/ppm/</url>
-    <updatecontact>agx@sigxcpu.org</updatecontact>
-    <screenshots>
-      <screenshot type="default" width="411" height="183">https://honk.sigxcpu.org/piki/projects/ppm/check.png</screenshot>
-      <screenshot width="411" height="183">https://honk.sigxcpu.org/piki/projects/ppm/topup.png</screenshot>
-    </screenshots>
-</component>
-- 
cgit v1.2.3