[dia/bilelmoussaoui/freedesktop-compliant: 6/7] Fix file names

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit 3366123ea680855e1fb7efdf3348e6dd82d18f67
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Thu Sep 19 23:46:49 2019 +0200

    Fix file names

 data/meson.build                                                 | 2 ++
 data/{org.gnome.Dia.appdata.xml => org.gnome.Dia.appdata.xml.in} | 0
 data/{org.gnome.Dia.desktop => org.gnome.Dia.desktop.in}         | 0
 po/POTFILES.in                                                   | 3 ++-
 po/meson.build                                                   | 2 --
 5 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index d91875d8..1d13f243 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -8,6 +8,7 @@ desktop_file = i18n.merge_file(
   install_dir: join_paths(datadir, 'applications')
 )
 # Validate Desktop file
+desktop_file_validate = find_program('desktop-file-validate', required: false)
 if desktop_file_validate.found()
   test(
     'validate-desktop',
@@ -26,6 +27,7 @@ appdata_file = i18n.merge_file (
   install_dir: join_paths(datadir, 'metainfo')
 )
 # Validate Appdata
+appstream_util = find_program('appstream-util', required: false)
 if appstream_util.found()
   test(
     'validate-appdata', appstream_util,
diff --git a/data/org.gnome.Dia.appdata.xml b/data/org.gnome.Dia.appdata.xml.in
similarity index 100%
rename from data/org.gnome.Dia.appdata.xml
rename to data/org.gnome.Dia.appdata.xml.in
diff --git a/data/org.gnome.Dia.desktop b/data/org.gnome.Dia.desktop.in
similarity index 100%
rename from data/org.gnome.Dia.desktop
rename to data/org.gnome.Dia.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3dea74cf..107bf215 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,7 +34,8 @@ app/sheet-editor/sheets_dialog_callbacks.c
 app/splash.c
 app/toolbox.c
 app/winmain.c
-data/dia.desktop
+data/org.gnome.Dia.appdata.xml.in
+data/org.gnome.Dia.desktop.in
 installer/win32/gennsh.c
 lib/arrows.c
 lib/attributes.c
diff --git a/po/meson.build b/po/meson.build
index dadceab5..6a85cf62 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,7 +1,5 @@
 i18n = import('i18n')
 
-po_dir = meson.current_source_dir()
-
 i18n.gettext(meson.project_name(),
              preset: 'glib',
              data_dirs : '.')