[yelp] Simplify desktop file generation

[David King <davidk src gnome org>]

commit e34c702209d8d35b9e40a3762cdf0cb2c778f5d8
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Thu Jan 24 22:15:53 2019 +0100

    Simplify desktop file generation
    
    Desktop file was processed twice - by the configure script and by
    intltool. Configure was putting a yelp version to some
    bugzilla-related value. Bugzilla is an obsolete bug tracker in GNOME
    (the project has moved to GNOME gitlab), so the field is also
    obsolete. With dropping the fields, configure has no business in the
    desktop file any more.

 .gitignore                            | 1 -
 Makefile.am                           | 4 ++--
 configure.ac                          | 1 -
 po/POTFILES.in                        | 2 +-
 po/POTFILES.skip                      | 1 -
 yelp.desktop.in.in => yelp.desktop.in | 4 ----
 6 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d85f8fd3..ad11bf1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ yelp
 /stamp-h1
 /yelp
 /yelp.desktop
-/yelp.desktop.in
 
 /data/org.gnome.yelp.gschema.valid
 /data/domains/yelp.xml
diff --git a/Makefile.am b/Makefile.am
index 593e1a10..ad256137 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -281,8 +281,8 @@ install-exec-hook:
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
-desktop_in_files=yelp.desktop.in.in
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+desktop_in_files=yelp.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_XML_RULE@
 
diff --git a/configure.ac b/configure.ac
index 3dfda213..cf10258e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,6 @@ data/xslt/mal2html.xsl
 data/xslt/man2html.xsl
 data/xslt/yelp-common.xsl
 po/Makefile.in
-yelp.desktop.in
 ])
 
 AC_OUTPUT
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 76572b24..e5990393 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,4 +23,4 @@ libyelp/yelp-view.c
 src/yelp-application.c
 src/yelp-window.c
 src/yelp.c
-yelp.desktop.in.in
+yelp.desktop.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d10aa085..ad27f325 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -3,7 +3,6 @@ src/yelp-search-parser.c
 src/yelp-search.c
 src/yelp-toc.c
 src/yelp-db-print.c
-yelp.desktop.in
 sub/src/yelp-print.c
 sub/src/yelp-search-parser.c
 sub/src/yelp-search.c
diff --git a/yelp.desktop.in.in b/yelp.desktop.in
similarity index 73%
rename from yelp.desktop.in.in
rename to yelp.desktop.in
index 60780f4f..809f2898 100644
--- a/yelp.desktop.in.in
+++ b/yelp.desktop.in
@@ -9,8 +9,4 @@ StartupNotify=true
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Core;Documentation;Utility;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=Yelp
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
 MimeType=x-scheme-handler/ghelp;x-scheme-handler/help;x-scheme-handler/info;x-scheme-handler/man;