diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | data/Makefile.am | 8 | ||||
| -rw-r--r-- | data/evolution.keys.in.in (renamed from data/evolution.keys.in) | 24 |
3 files changed, 25 insertions, 14 deletions
@@ -1,5 +1,12 @@ 2004-01-22 Rodney Dawes <dobey@ximian.com> + * data/Makefile.am: Add rule to substitute BASE_VERSION in keys + * data/evolution.keys.in: Removed this file from CVS + * data/evolution.keys.in.in: Update to use BASE_VERSION and the + new addressbook vcard control that replaces the MiniCard control + +2004-01-22 Rodney Dawes <dobey@ximian.com> + * configure.in: Don't require $LIBBONOBOUI_REQUIRED version of libbonobo diff --git a/data/Makefile.am b/data/Makefile.am index f33f034bf0..8f2f1dc56f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -3,11 +3,15 @@ desktop_in_in_file = evolution.desktop.in.in desktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop) %.desktop.in: %.desktop.in.in sed -e "s|\@BASE_VERSION\@|$(BASE_VERSION)|" $< > $@ + @INTLTOOL_DESKTOP_RULE@ keysdir = $(datadir)/mime-info -keys_in_file = evolution.keys.in -keys_file = $(keys_in_file:.keys.in=.keys) +keys_in_file = evolution.keys.in.in +keys_file = $(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 diff --git a/data/evolution.keys.in b/data/evolution.keys.in.in index c2c27d1af7..6baf605235 100644 --- a/data/evolution.keys.in +++ b/data/evolution.keys.in.in @@ -1,24 +1,24 @@ text/x-vcard _description=address card default_action_type=component - default_component_iid=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control - short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control - short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control - short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control + 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 - short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control - short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control - short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control + 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 - short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control - short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control - short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control + 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@ |