[gitg/gnome-3-30] desktop: Remove obsolete Bug Buddy/Bugzilla entries

[Alberto Fanjul <albfan src gnome org>]

commit 46ddb4c5e83049c2ab1939515a306f430e9f7a60
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Fri Oct 26 17:32:13 2018 +0200

    desktop: Remove obsolete Bug Buddy/Bugzilla entries

 data/{gitg.desktop.in.in => gitg.desktop.in} |  4 ----
 data/meson.build                             | 11 +----------
 po/POTFILES.in                               |  2 +-
 po/POTFILES.skip                             |  2 --
 4 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/data/gitg.desktop.in.in b/data/gitg.desktop.in
similarity index 71%
rename from data/gitg.desktop.in.in
rename to data/gitg.desktop.in
index 2d4bc7b0..bb03ebae 100644
--- a/data/gitg.desktop.in.in
+++ b/data/gitg.desktop.in
@@ -10,7 +10,3 @@ Icon=gitg
 Categories=GNOME;GTK;Development;
 MimeType=x-scheme-handler/gitg;
 #X-GNOME-DocPath=gitg/gitg.xml
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gitg
-X-GNOME-Bugzilla-Component=core
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/data/meson.build b/data/meson.build
index 26ad86ff..c62ff382 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,20 +1,11 @@
 subdir('icons')
 
-desktop_conf = configuration_data()
-desktop_conf.set('VERSION', gitg_version)
-
 desktop = 'gitg.desktop'
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf,
-)
-
 i18n.merge_file(
   desktop,
   type: 'desktop',
-  input: desktop_in,
+  input: desktop + '.in',
   output: desktop,
   po_dir: po_dir,
   install: true,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fa711a3a..0710e32b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 # This list has been automatically generated by update-potfiles.
 contrib/xml/xml-reader.c
-data/gitg.desktop.in.in
+data/gitg.desktop.in
 data/org.gnome.gitg.gschema.xml.in
 gitg/commit/gitg-commit-dialog.vala
 gitg/commit/gitg-commit.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 63ad60a4..3a637232 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,7 +1,5 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
-data/gitg.desktop.in
-sub/data/gitg.desktop.in
 gitg/commit/gitg-commit.c
 gitg/commit/gitg-commit-dialog.c
 gitg/gitg-action-support.c