[epiphany/wip/autocrap: 30/37] Remove Bug Buddy crap from desktop file and simplify generation

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 0711c69b583af8a5a455e75458a96058f74317d0
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Jun 29 18:29:13 2015 -0500

    Remove Bug Buddy crap from desktop file and simplify generation
    
    No need for the .desktop.in.in with the Bug Buddy stuff removed.

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    4 ++--
 ...{epiphany.desktop.in.in => epiphany.desktop.in} |    5 -----
 po/POTFILES.in                                     |    2 +-
 po/POTFILES.skip                                   |    1 -
 5 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f417c1a..f6a9551 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,7 +205,7 @@ AC_DEFINE([EPIPHANY_COMPILATION],[1],[Compiling epiphany])
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
-data/epiphany.desktop.in
+data/epiphany.desktop
 data/pages/Makefile
 doc/Makefile
 help/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index c2569ec..7cb3a90 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,9 +4,9 @@ SUBDIRS = pages
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_XML_RULE@
 
-desktop_in_files = epiphany.desktop.in.in
+desktop_in_files = epiphany.desktop.in
 desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 convertdir = $(datarootdir)/GConf/gsettings
 convert_DATA = epiphany.convert
diff --git a/data/epiphany.desktop.in.in b/data/epiphany.desktop.in
similarity index 76%
rename from data/epiphany.desktop.in.in
rename to data/epiphany.desktop.in
index ffea017..2824ef3 100644
--- a/data/epiphany.desktop.in.in
+++ b/data/epiphany.desktop.in
@@ -9,11 +9,6 @@ StartupNotify=true
 Terminal=false
 Type=Application
 Icon=web-browser
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=epiphany
-X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version= VERSION@
-X-GNOME-UsesNotifications=true
 Categories=Network;GNOME;GTK;WebBrowser;
 
MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;multipart/related;application/x-mimearchive;message/rfc822;
 Actions=Incognito;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e191525..ecc53f8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
 # Please keep this file sorted alphabetically.
 [type: gettext/xml]data/default-bookmarks.rdf.in
 data/epiphany.appdata.xml.in
-data/epiphany.desktop.in.in
+data/epiphany.desktop.in
 data/org.gnome.epiphany.gschema.xml
 embed/ephy-about-handler.c
 embed/ephy-download.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 7fb4a8b..5da6561 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,3 @@
 data/bme.desktop.in
 data/epiphany.appdata.xml
-data/epiphany.desktop.in
 plugins/desktop-file/plugin.cpp