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.

8 files changed, 67 insertions, 47 deletions

diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 9f757e3909..32190bba12 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = evolution-alarm-notify
+privlibexec_PROGRAMS = evolution-alarm-notify
 
 if HAVE_WINDRES
 EVOLUTIONALARMNOTIFYICON = evolution-alarm-notify-icon.o
diff --git a/configure.ac b/configure.ac
index 052f303624..ba30c04103 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1382,6 +1382,9 @@ AC_SUBST(viewsdir)
 privconduitdir="$privlibdir/conduits"
 AC_SUBST(privconduitdir)
 
+dnl For evolution-alarm-notify.desktop
+AS_AC_EXPAND(PRIVLIBEXECDIR, "$privlibexecdir")
+
 dnl ************************
 dnl Plugins
 dnl ************************
@@ -1646,6 +1649,9 @@ addressbook/tools/csv2vcard
 addressbook/util/Makefile
 art/Makefile
 data/Makefile
+data/evolution.desktop.in
+data/evolution-alarm-notify.desktop.in
+data/evolution-settings.desktop.in
 data/icons/Makefile
 doc/Makefile
 doc/reference/Makefile
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@
-
diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4
new file mode 100644
index 0000000000..8bd95a85cc
--- /dev/null
+++ b/m4/as-ac-expand.m4
@@ -0,0 +1,50 @@
+dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
+dnl autostars m4 macro for expanding directories using configure's prefix
+
+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+
+dnl example:
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])
+
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