[cheese] build: Remove obsolete X-GNOME-* keys

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 9cc1bb0cd4c45553b0f5b9434c2e4c8198f57f0e
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Aug 2 11:57:52 2019 +0200

    build: Remove obsolete X-GNOME-* keys
    
    Cheese's desktop file contains obsolete `X-GNOME-*` keys. Due to
    this these keys has been removed.
    
    The desktop file was also used as an input file to replace
    `PACKAGE_VERSION` tag, used by `X-GNOME-Bugzilla-Version`. However,
    once this key has been removed there is no tag to be replaced so
    the input file has been renamed from `.in.in` to `.in` so only the
    is processed once to merge translations.

 data/meson.build                                                  | 8 +-------
 ...org.gnome.Cheese.desktop.in.in => org.gnome.Cheese.desktop.in} | 5 -----
 po/POTFILES.in                                                    | 2 +-
 po/POTFILES.skip                                                  | 2 --
 4 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 051341f2..aa5acbdb 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -22,15 +22,9 @@ resource_sources = gnome.compile_resources(
 
 desktop = cheese_namespace + '.desktop'
 
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: '@BASENAME@',
-  configuration: {'PACKAGE_VERSION': cheese_version},
-)
-
 custom_target(
   desktop,
-  input: desktop_in,
+  input: desktop + '.in',
   output: '@BASENAME@',
   command: intltool_desktop_cmd,
   install: true,
diff --git a/data/org.gnome.Cheese.desktop.in.in b/data/org.gnome.Cheese.desktop.in
similarity index 63%
rename from data/org.gnome.Cheese.desktop.in.in
rename to data/org.gnome.Cheese.desktop.in
index efd9922d..63ea4d5e 100644
--- a/data/org.gnome.Cheese.desktop.in.in
+++ b/data/org.gnome.Cheese.desktop.in
@@ -1,7 +1,6 @@
 [Desktop Entry]
 _Name=Cheese
 _GenericName=Webcam Booth
-_X-GNOME-FullName=Cheese Webcam Booth
 _Comment=Take photos and videos with your webcam, with fun graphical effects
 _Keywords=photo;video;webcam;
 Exec=cheese
@@ -10,8 +9,4 @@ Type=Application
 StartupNotify=true
 Icon=org.gnome.Cheese
 Categories=GNOME;AudioVideo;Video;Recorder;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=cheese
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@PACKAGE_VERSION@
 DBusActivatable=true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 14be4fee..16d5c97a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,7 +7,7 @@
 [type: gettext/glade]data/menus.ui
 [type: gettext/glade]data/shortcuts.ui
 data/org.gnome.Cheese.appdata.xml.in
-data/org.gnome.Cheese.desktop.in.in
+data/org.gnome.Cheese.desktop.in
 [type: gettext/gsettings]data/org.gnome.Cheese.gschema.xml
 libcheese/cheese-avatar-chooser.c
 libcheese/cheese-avatar-widget.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e14b315e..ce9a653e 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,10 +1,8 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
-data/org.gnome.Cheese.desktop.in
 src/cheese-application.c
 src/cheese-countdown.c
 src/cheese-effects-manager.c
 src/cheese-main.c
 src/cheese-preferences.c
 src/cheese-window.c
-sub/data/org.gnome.Cheese.desktop.in