[tracker-miners/wip/piotrdrag/kill-intltool: 2/2] Migrate D-Bus service files from Intltool to Gettext

[Debarshi Ray <debarshir src gnome org>]

commit c457be965899b14164171fc462452acf8e3a9857
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Fri Sep 28 19:00:23 2018 +0200

    Migrate D-Bus service files from Intltool to Gettext
    
    https://gitlab.gnome.org/GNOME/tracker/issues/36

 meson.build                                           |  2 +-
 po/POTFILES.in                                        |  6 +++---
 po/POTFILES.skip                                      |  6 +++---
 po/meson.build                                        |  6 +++++-
 src/miners/fs/meson.build                             | 13 ++++++++-----
 ...esktop.Tracker1.Miner.Files.service.desktop.in.in} |  4 ++--
 src/miners/rss/meson.build                            | 13 ++++++++-----
 ...edesktop.Tracker1.Miner.RSS.service.desktop.in.in} |  4 ++--
 src/tracker-extract/meson.build                       | 19 +++++++++++--------
 ...ktop.Tracker1.Miner.Extract.service.desktop.in.in} |  4 ++--
 10 files changed, 45 insertions(+), 32 deletions(-)
---
diff --git a/meson.build b/meson.build
index 614398638..d74213d52 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('tracker-miners', 'c',
         version: '2.2.99.0',
-        meson_version: '>=0.47')
+        meson_version: '>=0.51.0')
 
 gnome = import('gnome')
 i18n = import('i18n')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9497a963e..9921d3ae1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,15 +5,15 @@ data/org.freedesktop.Tracker.Miner.Files.gschema.xml
 data/org.freedesktop.Tracker.Writeback.gschema.xml
 src/libtracker-miners-common/tracker-dbus.c
 src/libtracker-miners-common/tracker-utils.c
-src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
+src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
 src/miners/fs/tracker-main.c
 src/miners/fs/tracker-miner-files.c
 src/miners/fs/tracker-miner-fs.desktop.in.in
-src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
+src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
 src/miners/rss/tracker-main.c
 src/miners/rss/tracker-miner-rss.c
 src/miners/rss/tracker-miner-rss.desktop.in.in
-src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
+src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
 src/tracker-extract/tracker-extract.c
 src/tracker-extract/tracker-main.c
 src/tracker-extract/tracker-extract.desktop.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 933b057c7..30662e452 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,8 +1,8 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
-src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
+src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in
 src/miners/fs/tracker-miner-fs.desktop.in
-src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
+src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in
 src/miners/rss/tracker-miner-rss.desktop.in
-src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in
+src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in
 src/tracker-extract/tracker-extract.desktop.in
diff --git a/po/meson.build b/po/meson.build
index 9fec2bcf0..2e0ac5a0f 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1 +1,5 @@
-i18n.gettext('tracker-miners', preset: 'glib')
+i18n.gettext(
+  'tracker-miners',
+  preset: 'glib',
+  args: '--keyword=DisplayName',
+)
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index 2202640b9..05e9c85fe 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -35,16 +35,19 @@ executable('tracker-miner-fs', sources,
 )
 
 dbus_service_file_untranslated = configure_file(
-    input: 'org.freedesktop.Tracker1.Miner.Files.service.in.in',
-    output: 'org.freedesktop.Tracker1.Miner.Files.service.in',
+    input: 'org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in',
+    output: 'org.freedesktop.Tracker1.Miner.Files.service.desktop.in',
     configuration: conf)
 
-dbus_service_file = custom_target('tracker-miner-files-dbus-service-file',
+i18n.merge_file('tracker-miner-files-dbus-service-file',
+    type: 'desktop',
     input: dbus_service_file_untranslated,
     output: 'org.freedesktop.Tracker1.Miner.Files.service',
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 
'po'), '@INPUT@', '@OUTPUT@'],
+    po_dir: po_dir,
     install: true,
-    install_dir: dbus_services_dir)
+    install_dir: dbus_services_dir,
+    args: ['--keyword=Comment', '--keyword=DisplayName'],
+)
 
 desktop_file_untranslated = configure_file(
     input: 'tracker-miner-fs.desktop.in.in',
diff --git a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in 
b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
similarity index 81%
rename from src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
rename to src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
index a61719947..b58c0b8b2 100644
--- a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
+++ b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
@@ -6,5 +6,5 @@ SystemdService=tracker-miner-fs.service
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker1/Miner/Files
 NameSuffix=Miner.Files
-_DisplayName=File System
-_Comment=File system data miner
+DisplayName=File System
+Comment=File system data miner
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index ef2060a52..2390e8c93 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -12,16 +12,19 @@ executable('tracker-miner-rss', sources,
 )
 
 dbus_service_file_untranslated = configure_file(
-    input: 'org.freedesktop.Tracker1.Miner.RSS.service.in.in',
-    output: 'org.freedesktop.Tracker1.Miner.RSS.service.in',
+    input: 'org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in',
+    output: 'org.freedesktop.Tracker1.Miner.RSS.service.desktop.in',
     configuration: conf)
 
-dbus_service_file = custom_target('tracker-miner-rss-dbus-service-file',
+i18n.merge_file('tracker-miner-rss-dbus-service-file',
+    type: 'desktop',
     input: dbus_service_file_untranslated,
     output: 'org.freedesktop.Tracker1.Miner.RSS.service',
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 
'po'), '@INPUT@', '@OUTPUT@'],
+    po_dir: po_dir,
     install: true,
-    install_dir: dbus_services_dir)
+    install_dir: dbus_services_dir,
+    args: ['--keyword=Comment', '--keyword=DisplayName'],
+)
 
 desktop_file_untranslated = configure_file(
     input: 'tracker-miner-rss.desktop.in.in',
diff --git a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in 
b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
similarity index 80%
rename from src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
rename to src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
index 372c21965..5da6d455e 100644
--- a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
+++ b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
@@ -6,5 +6,5 @@ SystemdService=tracker-miner-rss.service
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker1/Miner/RSS
 NameSuffix=Miner.RSS
-_DisplayName=RSS/ATOM Feeds
-_Comment=Fetch RSS/ATOM Feeds
+DisplayName=RSS/ATOM Feeds
+Comment=Fetch RSS/ATOM Feeds
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index abd6de33a..a085907b0 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -170,16 +170,19 @@ executable('tracker-extract',
   install_rpath: tracker_install_rpath)
 
 dbus_service_file_untranslated = configure_file(
-  input: 'org.freedesktop.Tracker1.Miner.Extract.service.in.in',
-  output: 'org.freedesktop.Tracker1.Miner.Extract.service.in',
+  input: 'org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in',
+  output: 'org.freedesktop.Tracker1.Miner.Extract.service.desktop.in',
   configuration: conf)
 
-dbus_service_file = custom_target('tracker-extract-dbus-service-file',
-  input: dbus_service_file_untranslated,
-  output: 'org.freedesktop.Tracker1.Miner.Extract.service',
-  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), 
'@INPUT@', '@OUTPUT@'],
-  install: true,
-  install_dir: dbus_services_dir)
+i18n.merge_file('tracker-extract-dbus-service-file',
+    type: 'desktop',
+    input: dbus_service_file_untranslated,
+    output: 'org.freedesktop.Tracker1.Miner.Extract.service',
+    po_dir: po_dir,
+    install: true,
+    install_dir: dbus_services_dir,
+    args: ['--keyword=Comment', '--keyword=DisplayName'],
+)
 
 desktop_file_untranslated = configure_file(
   input: 'tracker-extract.desktop.in.in',
diff --git a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in 
b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
similarity index 82%
rename from src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
rename to src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
index 32dd1dfd0..17b294bfc 100644
--- a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
+++ b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
@@ -6,5 +6,5 @@ SystemdService=tracker-extract.service
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker1/Miner/Extract
 NameSuffix=Miner.Extract
-_DisplayName=Extractor
-_Comment=Metadata extractor
+DisplayName=Extractor
+Comment=Metadata extractor