diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 8 | ||||
| -rw-r--r-- | data/bme.desktop.in.in (renamed from data/bme.desktop.in) | 2 | ||||
| -rw-r--r-- | data/epiphany.desktop.in.in (renamed from data/epiphany.desktop.in) | 2 |
5 files changed, 19 insertions, 7 deletions
@@ -1,3 +1,15 @@ +2005-11-29 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: + * data/Makefile.am: + R data/bme.desktop.in: + A data/bme.desktop.in.in: + R data/epiphany.desktop.in: + A data/epiphany.desktop.in.in: + + Remove empty DocPath from desktop files, and add bugzilla version. + Generate the .in files from configure. + 2005-11-28 Christian Persch <chpe@cvs.gnome.org> * configure.ac: diff --git a/configure.ac b/configure.ac index f12b487a9..0f5a708c8 100644 --- a/configure.ac +++ b/configure.ac @@ -614,6 +614,8 @@ AC_CONFIG_FILES([ Makefile data/Makefile data/epiphany-1.10.pc +data/epiphany.desktop.in +data/bme.desktop.in data/glade/Makefile data/art/Makefile data/ui/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 79703f376..ecca2c602 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -29,11 +29,9 @@ server_in_files = GNOME_Epiphany_Automation.server.in server_DATA = GNOME_Epiphany_Automation.server serverdir = $(libdir)/bonobo/servers -DESKTOP_IN_FILES= epiphany.desktop.in bme.desktop.in -DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in=.desktop) - +desktop_in_file= epiphany.desktop.in.in bme.desktop.in.in desktopdir = $(datadir)/applications -desktop_DATA = $(DESKTOP_FILES) +desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) applicationsdir = $(datadir)/application-registry applications_DATA = epiphany.applications @@ -73,7 +71,7 @@ EXTRA_DIST = \ $(server_in_files) \ $(schema_in_files) \ $(font_schema_files) \ - $(DESKTOP_IN_FILES) \ + $(desktop_in_files) \ $(about_DATA) \ $(applications_DATA) \ $(mimepermission_DATA) \ diff --git a/data/bme.desktop.in b/data/bme.desktop.in.in index f2e1da1a4..acefabe19 100644 --- a/data/bme.desktop.in +++ b/data/bme.desktop.in.in @@ -8,8 +8,8 @@ StartupNotify=true Terminal=false Type=Application Icon=epiphany-bookmarks.png -X-GNOME-DocPath= X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=epiphany X-GNOME-Bugzilla-Component=General +X-GNOME-Bugzilla-Version=@VERSION@ Categories=Application;Network;GNOME;GTK; diff --git a/data/epiphany.desktop.in b/data/epiphany.desktop.in.in index 3edcb81de..9f57afd5f 100644 --- a/data/epiphany.desktop.in +++ b/data/epiphany.desktop.in.in @@ -8,9 +8,9 @@ StartupNotify=true Terminal=false Type=Application Icon=web-browser.png -X-GNOME-DocPath= X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=epiphany X-GNOME-Bugzilla-Component=General +X-GNOME-Bugzilla-Version=@VERSION@ Categories=Application;Network;GNOME;GTK;WebBrowser; MimeType=text/html;text/xml;application/xhtml+xml; |