[devhelp] Remove the X-GNOME-Bugzilla entries from the *.desktop file

[Sébastien Wilmet <swilmet src gnome org>]

commit bef020b783af96ca61f49ce401bb55d0f7fc4796
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Mon Mar 12 15:25:10 2018 +0100

    Remove the X-GNOME-Bugzilla entries from the *.desktop file
    
    - It gets in the way to port the build system to Meson (the simpler the
    build system the better), because of @VERSION@.
    - It is planned to move Devhelp to GitLab.
    
    Clean up a little also the Makefile.am, and make it easier to read.

 configure.ac                                       |    1 -
 data/Makefile.am                                   |    9 ++++-----
 ....desktop.in.in => org.gnome.Devhelp.desktop.in} |    4 ----
 po/POTFILES.in                                     |    2 +-
 po/POTFILES.skip                                   |    1 -
 5 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2164736..5cb89aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,6 @@ AC_CONFIG_FILES([
        Makefile
        data/libdevhelp-3.0.pc
        data/Makefile
-       data/org.gnome.Devhelp.desktop.in
        data/icons/Makefile
        devhelp/Makefile
        docs/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 7050086..3c197ad 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,10 +21,10 @@ $(appstream_XML): $(appstream_in_files)
        $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 desktopdir = $(datadir)/applications
-desktop_in_files = org.gnome.Devhelp.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_in_file = org.gnome.Devhelp.desktop.in
+desktop_DATA = org.gnome.Devhelp.desktop
 
-$(desktop_DATA): $(desktop_in_files)
+$(desktop_DATA): $(desktop_in_file)
        $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 dbusservicedir = $(datadir)/dbus-1/services
@@ -40,14 +40,13 @@ man_MANS = devhelp.1
 
 EXTRA_DIST =                   \
        libdevhelp-3.0.pc.in    \
-       $(desktop_in_files)     \
+       $(desktop_in_file)      \
        $(gsettings_SCHEMAS)    \
        $(assistant_DATA) \
        $(man_MANS) \
        $(appstream_in_files)
 
 CLEANFILES =                   \
-       $(DESKTOP_FILES)        \
        $(defaults_DATA)        \
        $(desktop_DATA)         \
        $(dbusservice_DATA)     \
diff --git a/data/org.gnome.Devhelp.desktop.in.in b/data/org.gnome.Devhelp.desktop.in
similarity index 80%
rename from data/org.gnome.Devhelp.desktop.in.in
rename to data/org.gnome.Devhelp.desktop.in
index f1d52ad..faf5242 100644
--- a/data/org.gnome.Devhelp.desktop.in.in
+++ b/data/org.gnome.Devhelp.desktop.in
@@ -11,8 +11,4 @@ Type=Application
 Icon=devhelp
 Categories=GNOME;GTK;Development;
 StartupNotify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=devhelp
-X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=@VERSION@
 DBusActivatable=true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bf3dd24..0c888fe 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 data/org.gnome.Devhelp.appdata.xml.in
-data/org.gnome.Devhelp.desktop.in.in
+data/org.gnome.Devhelp.desktop.in
 data/org.gnome.devhelp.gschema.xml
 data/org.gnome.libdevhelp-3.gschema.xml
 devhelp/dh-assistant-view.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 047f9ba..e69de29 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +0,0 @@
-data/org.gnome.Devhelp.desktop.in