From 8059a6ad3a150f93c950f1027bd3936a66ac73b9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes 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. --- po/POTFILES.in | 1 - po/POTFILES.skip | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'po') diff --git a/po/POTFILES.in b/po/POTFILES.in index d165c725ce..9b7a9f6930 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -151,7 +151,6 @@ capplet/settings/mail-settings-view.c data/evolution-alarm-notify.desktop.in.in data/evolution.desktop.in.in data/evolution-settings.desktop.in.in -data/evolution.keys.in.in e-util/e-activity.c e-util/e-alert.c e-util/e-categories-config.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 0ecfc5e77c..28efafd2f1 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -9,6 +9,9 @@ addressbook/tools/evolution-addressbook-import.c calendar/gui/calendar-component.c calendar/gui/dialogs/meeting-page.etspec calendar/gui/e-pub-utils.c +data/evolution-alarm-notify.desktop.in +data/evolution-settings.desktop.in +data/evolution.desktop.in designs/OOA/ooa.ui designs/read_receipts/read.ui mail/em-folder-browser.c -- cgit v1.2.3