From 2bc81c527704c280323a8b1ab16338e132ecdd46 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 17 May 2010 15:42:11 -0400
Subject: Bug 617865 - Various data file cleanups

- Install evolution-alarm-notify in $(privlibexecdir) instead of
  $(bindir).

- Set the X-GNOME-Bugzilla-Version in evolution-alarm-notify.desktop to
  @BASE_VERSION@.x (patch was missing the .x suffix).

- Killed data/evolution.keys.in.in since it's full of CORBA cruft.
  The MimeType field in evolution.desktop fills this role now.

- Copied the AS_AC_EXPAND macro from gnome-settings-daemon.  The macro
  sets up path-related substitutions for use in automake input files.

  So for example AS_AC_EXPAND(PRIVLIBEXECDIR, "$privlibexecdir") in
  configure.ac allows us to use @PRIVLIBEXECDIR@ in .desktop.in files.

- Simplified .desktop rules using gnome-settings-daemon as a guide.
---
 data/evolution-alarm-notify.desktop.in.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/evolution-alarm-notify.desktop.in.in')

diff --git a/data/evolution-alarm-notify.desktop.in.in b/data/evolution-alarm-notify.desktop.in.in
index df9f7f980d..4f382a4a36 100644
--- a/data/evolution-alarm-notify.desktop.in.in
+++ b/data/evolution-alarm-notify.desktop.in.in
@@ -3,7 +3,7 @@ Type=Application
 _Name=Evolution Alarm Notify
 _Comment=Calendar event notifications
 Icon=appointment-soon
-Exec=evolution-alarm-notify
+Exec=@PRIVLIBEXECDIR@/evolution-alarm-notify
 Terminal=false
 Type=Application
 Categories=
@@ -12,4 +12,4 @@ X-Moblin-Priority=Low
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=evolution
 X-GNOME-Bugzilla-Component=calendar
-X-GNOME-Bugzilla-Version=@VERSION@
+X-GNOME-Bugzilla-Version=@BASE_VERSION@.x
-- 
cgit