[rhythmbox: 1/2] desktop: Remove obsolete Bugzilla entries

[Jonathan Matthew <jmatthew src gnome org>]

commit 297c4ccea08b13267f8dcb3eae20d1bebfbd6e6f
Author: Jake Dane <3689-jakedane users noreply gitlab gnome org>
Date:   Sun Sep 11 09:20:13 2022 +0000

    desktop: Remove obsolete Bugzilla entries
    
    The X-GNOME-Bugzilla-* entries were for use by bug-buddy, a GNOME 2
    technology that's been gone for over a decade. These entries are
    obsolete and can be removed.

 data/meson.build                                                   | 7 +------
 ...me.Rhythmbox3.desktop.in.in => org.gnome.Rhythmbox3.desktop.in} | 5 -----
 ...device.desktop.in.in => org.gnome.Rhythmbox3.device.desktop.in} | 5 -----
 po/POTFILES.in                                                     | 4 ++--
 po/POTFILES.skip                                                   | 2 --
 5 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index f8a09e41f..2e91abcff 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,13 +2,8 @@ po_dir = meson.project_source_root() / 'po'
 
 desktop_files = [ 'org.gnome.Rhythmbox3.desktop', 'org.gnome.Rhythmbox3.device.desktop' ]
 foreach desktop_file : desktop_files
-  desktop_in_file = configure_file(
-    input: desktop_file + '.in.in',
-    output: desktop_file + '.in',
-    configuration: cdata
-  )
   desktop_file = i18n.merge_file(
-    input: desktop_in_file,
+    input: desktop_file + '.in',
     output: desktop_file,
     install: true,
     install_dir: datadir / 'applications',
diff --git a/data/org.gnome.Rhythmbox3.desktop.in.in b/data/org.gnome.Rhythmbox3.desktop.in
similarity index 76%
rename from data/org.gnome.Rhythmbox3.desktop.in.in
rename to data/org.gnome.Rhythmbox3.desktop.in
index 252eef042..f209a7fc9 100644
--- a/data/org.gnome.Rhythmbox3.desktop.in.in
+++ b/data/org.gnome.Rhythmbox3.desktop.in
@@ -12,9 +12,4 @@ X-GNOME-DocPath=rhythmbox/rhythmbox.xml
 Categories=GNOME;GTK;AudioVideo;Audio;Player;
 
MimeType=application/x-ogg;application/ogg;audio/x-vorbis+ogg;audio/vorbis;audio/x-vorbis;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;audio/mp4;audio/x-it;audio/x-mod;audio/x-s3m;audio/x-stm;audio/x-xm;
 StartupNotify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=rhythmbox
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-OtherBinaries=rhythmbox-client;rhythmbox-metadata;
-X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-UsesNotifications=true
diff --git a/data/org.gnome.Rhythmbox3.device.desktop.in.in b/data/org.gnome.Rhythmbox3.device.desktop.in
similarity index 67%
rename from data/org.gnome.Rhythmbox3.device.desktop.in.in
rename to data/org.gnome.Rhythmbox3.device.desktop.in
index 07e2311ac..289329f03 100644
--- a/data/org.gnome.Rhythmbox3.device.desktop.in.in
+++ b/data/org.gnome.Rhythmbox3.device.desktop.in
@@ -12,8 +12,3 @@ X-GNOME-DocPath=rhythmbox/rhythmbox.xml
 Categories=GNOME;GTK;AudioVideo;
 MimeType=x-content/audio-player;x-content/audio-cdda;
 StartupNotify=false
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=rhythmbox
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-OtherBinaries=rhythmbox;rhythmbox-metadata;
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b5db7bcad..f36740f21 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,8 +6,8 @@ backends/gstreamer/rb-player-gst-xfade.c
 backends/rb-player.c
 data/playlists.xml.in
 data/org.gnome.Rhythmbox3.appdata.xml.in
-data/org.gnome.Rhythmbox3.desktop.in.in
-data/org.gnome.Rhythmbox3.device.desktop.in.in
+data/org.gnome.Rhythmbox3.desktop.in
+data/org.gnome.Rhythmbox3.device.desktop.in
 data/ui/app-menu.ui
 data/ui/browser-popup.ui
 data/ui/create-playlist.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index abd5ebd81..e29deaf15 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,3 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
-data/org.gnome.Rhythmbox3.desktop.in
-data/org.gnome.Rhythmbox3.device.desktop.in
 data/org.gnome.rhythmbox.gschema.xml