diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-18 03:42:11 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-18 04:35:53 +0800 |
| commit | 8059a6ad3a150f93c950f1027bd3936a66ac73b9 (patch) | |
| tree | 1ee0f34d58f0a1335b10af8015e7cfc425686c3b /data | |
| parent | 9bd14384a3fe538d7a7013d71b370ac8f044c573 (diff) | |
| download | gsoc2013-evolution-8059a6ad3a150f93c950f1027bd3936a66ac73b9.tar gsoc2013-evolution-8059a6ad3a150f93c950f1027bd3936a66ac73b9.tar.gz gsoc2013-evolution-8059a6ad3a150f93c950f1027bd3936a66ac73b9.tar.bz2 gsoc2013-evolution-8059a6ad3a150f93c950f1027bd3936a66ac73b9.tar.lz gsoc2013-evolution-8059a6ad3a150f93c950f1027bd3936a66ac73b9.tar.xz gsoc2013-evolution-8059a6ad3a150f93c950f1027bd3936a66ac73b9.tar.zst gsoc2013-evolution-8059a6ad3a150f93c950f1027bd3936a66ac73b9.zip | |
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.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 24 | ||||
| -rw-r--r-- | data/evolution-alarm-notify.desktop.in.in | 4 | ||||
| -rw-r--r-- | data/evolution.keys.in.in | 24 |
3 files changed, 7 insertions, 45 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 9dcfd7b94b..b02037b37c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,27 +1,15 @@ SUBDIRS = icons desktopdir = $(datadir)/applications -desktop_in_in_file = evolution.desktop.in.in \ - evolution-settings.desktop.in.in -desktop_DATA = $(desktop_in_in_file:.desktop.in.in=.desktop) -%.desktop.in: %.desktop.in.in - sed -e "s|\@BASE_VERSION\@|$(BASE_VERSION)|" -e "s|\@DATASERVER_EXEC_VERSION\@|$(DATASERVER_EXEC_VERSION)|" $< > $@ +desktop_in_files = evolution.desktop.in evolution-settings.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) autostartdir = $(sysconfdir)/xdg/autostart -autostart_in_in_files = evolution-alarm-notify.desktop.in.in autostart_in_files = evolution-alarm-notify.desktop.in autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -keysdir = $(datadir)/mime-info -keys_in_file = evolution.keys.in.in -keys_DATA = $(keys_in_file:.keys.in.in=.keys) -%.keys.in: %.keys.in.in - sed -e "s|\@BASE_VERSION\@|$(BASE_VERSION)|" $< > $@ - -@INTLTOOL_KEYS_RULE@ - mimedir = $(datadir)/mime-info dist_mime_DATA = evolution.mime @@ -37,12 +25,10 @@ dist_noinst_MANS = evolution.1 CLEANFILES = \ $(autostart_DATA) \ - $(desktop_DATA) \ - $(keys_DATA) + $(desktop_DATA) EXTRA_DIST = \ - $(autostart_in_in_files) \ - $(desktop_in_in_file) \ - $(keys_in_file) + $(autostart_in_files) \ + $(desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/data/evolution-alarm-notify.desktop.in.in b/data/evolution-alarm-notify.desktop.in.in index 23b40644fa..ba15661d3e 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= @@ -11,4 +11,4 @@ OnlyShowIn=GNOME;XFCE; 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 diff --git a/data/evolution.keys.in.in b/data/evolution.keys.in.in deleted file mode 100644 index 6baf605235..0000000000 --- a/data/evolution.keys.in.in +++ /dev/null @@ -1,24 +0,0 @@ -text/x-vcard - _description=address card - default_action_type=component - default_component_iid=OAFIID:GNOME_Evolution_Addressbook_VCard_Control:@BASE_VERSION@ - short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Addressbook_VCard_Control:@BASE_VERSION@ - short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Addressbook_VCard_Control:@BASE_VERSION@ - short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Addressbook_VCard_Control:@BASE_VERSION@ - -text/x-calendar - _description=calendar information - default_action_type=component - default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control:@BASE_VERSION@ - short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control:@BASE_VERSION@ - short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control:@BASE_VERSION@ - short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control:@BASE_VERSION@ - -text/calendar - _description=calendar information - default_action_type=component - default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control:@BASE_VERSION@ - short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control:@BASE_VERSION@ - short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control:@BASE_VERSION@ - short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control:@BASE_VERSION@ - |