[gnome-dictionary] build: Simplify desktop file generation



commit 40804d34bfdeebada773a253d2c2e266116d5349
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Apr 11 17:13:00 2017 +0100

    build: Simplify desktop file generation
    
    We don't need an intermediate pass to substitute configure variables:
    the keys are unused in modern GNOME.

 data/Makefile.am                                   |   13 +++++--------
 ...sktop.in.in => org.gnome.Dictionary.desktop.in} |    3 ---
 2 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 69fe6be..9408c6e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,11 +9,8 @@ EXTRA_DIST += $(man_MANS)
 gdictappdir = $(datadir)/applications
 gdictapp_in_files = org.gnome.Dictionary.desktop.in
 gdictapp_DATA = $(gdictapp_in_files:.desktop.in=.desktop)
-EXTRA_DIST += org.gnome.Dictionary.desktop.in.in
-CLEANFILES += $(gdictapp_in_files) $(gdictapp_DATA)
-
-$(gdictapp_in_files): $(gdictapp_in_files:.desktop.in=.desktop.in.in)
-       $(AM_V_GEN)sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
+EXTRA_DIST += $(gdictapp_in_files)
+CLEANFILES += $(gdictapp_DATA)
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -33,9 +30,9 @@ appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = org.gnome.Dictionary.appdata.xml.in
 EXTRA_DIST += \
-                                                       $(appdata_in_files) \
-                                                       $(gsettings_SCHEMAS) \
-                                                       $(NULL)
+       $(appdata_in_files) \
+       $(gsettings_SCHEMAS) \
+       $(NULL)
 CLEANFILES += $(appdata_DATA)
 
 # dictionary sources definitions
diff --git a/data/org.gnome.Dictionary.desktop.in.in b/data/org.gnome.Dictionary.desktop.in
similarity index 77%
rename from data/org.gnome.Dictionary.desktop.in.in
rename to data/org.gnome.Dictionary.desktop.in
index 1932cdc..eb5e70c 100644
--- a/data/org.gnome.Dictionary.desktop.in.in
+++ b/data/org.gnome.Dictionary.desktop.in
@@ -10,7 +10,4 @@ StartupNotify=true
 Categories=GNOME;GTK;Office;Dictionary;
 NotShowIn=KDE;
 X-GNOME-DocPath=gnome-dictionary/gnome-dictionary.xml
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-dictionary
-X-GNOME-Bugzilla-Version=@VERSION@
 DBusActivatable=true


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]