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 from the desktop file.

The desktop file then has no variables so does not need to be
configured. It is renamed from `*.in.in` to `*.in` to reflect that and
build files and POTFILES are updated for this change.

7 files changed, 2 insertions, 21 deletions

diff --git a/configure.ac b/configure.ac
index d987c3f..603d803 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,6 +96,5 @@ libgnomekbd/Makefile
 libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml
 libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml
 libgnomekbd/org.gnome.libgnomekbd.gschema.xml
-libgnomekbd/gkbd-keyboard-display.desktop.in
 test/Makefile
 ])
diff --git a/libgnomekbd/.gitignore b/libgnomekbd/.gitignore
index fbc2c38..4e31ccb 100644
--- a/libgnomekbd/.gitignore
+++ b/libgnomekbd/.gitignore
@@ -7,7 +7,6 @@
 *.gschema.xml.in
 *.o
 *.desktop
-*.desktop.in
 *marshal.c
 *marshal.h
 Makefile
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
index 7419c53..42c2077 100644
--- a/libgnomekbd/Makefile.am
+++ b/libgnomekbd/Makefile.am
@@ -108,9 +108,6 @@ desktopdir = $(datadir)/applications
 desktop_in_files = gkbd-keyboard-display.desktop.in
 desktop_DATA = gkbd-keyboard-display.desktop
 
-%.desktop.in : %.desktop.in.in
-	$(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@
-
 %.desktop : %.desktop.in
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
diff --git a/libgnomekbd/gkbd-keyboard-display.desktop.in.in b/libgnomekbd/gkbd-keyboard-display.desktop.in
index 1662256..92b7f06 100644
--- a/libgnomekbd/gkbd-keyboard-display.desktop.in.in
+++ b/libgnomekbd/gkbd-keyboard-display.desktop.in
@@ -8,9 +8,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 NoDisplay=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=libgnomekbd
-X-GNOME-Bugzilla-Component=Drawing
-X-GNOME-Bugzilla-Version=@VERSION@
 Categories=GNOME;GTK;Core;System;
 OnlyShowIn=GNOME;
diff --git a/libgnomekbd/meson.build b/libgnomekbd/meson.build
index ca65a89..ed14f0f 100644
--- a/libgnomekbd/meson.build
+++ b/libgnomekbd/meson.build
@@ -163,17 +163,8 @@ install_headers(
   subdir: 'libgnomekbd',
 )
 
-gkbd_keyboard_display_cfg = configuration_data()
-gkbd_keyboard_display_cfg.set('VERSION', meson.project_version())
-
-gkbd_keyboard_display_in = configure_file(
-  input: 'gkbd-keyboard-display.desktop.in.in',
-  output: 'gkbd-keyboard-display.desktop.in',
-  configuration: gkbd_keyboard_display_cfg,
-)
-
 i18n.merge_file(
-  input: gkbd_keyboard_display_in,
+  input: 'gkbd-keyboard-display.desktop.in',
   output: 'gkbd-keyboard-display.desktop',
   po_dir: '../po',
   type: 'desktop',
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f79b367..1c8d1e1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,7 @@ libgnomekbd/gkbd-desktop-config.c
 libgnomekbd/gkbd-indicator.c
 libgnomekbd/gkbd-indicator-config.c
 libgnomekbd/gkbd-keyboard-config.c
-libgnomekbd/gkbd-keyboard-display.desktop.in.in
+libgnomekbd/gkbd-keyboard-display.desktop.in
 libgnomekbd/gkbd-keyboard-drawing.c
 libgnomekbd/gkbd-status.c
 libgnomekbd/gkbd-util.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d716c40..4dacfa3 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,5 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
-libgnomekbd/gkbd-keyboard-display.desktop.in
 libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
 libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
 libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in