[evolution-patches] Version independent desktop/keys file

[Harish Krishnaswamy <kharish novell com>]

The attached patch allows installing desktop/keys/mime files with
version independent names. This also obviates  panel/menu launchers
breaking after upgrades, by pointing to a version-neutral symlink .
Kindly review the same.
[ The installation of the symlink 'evolution' can be turned on by
setting the configure option 'enable-default-binary' to yes. ] 


Harish


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1523
diff -u -p -r1.1523 ChangeLog
--- ChangeLog	8 Sep 2005 10:02:39 -0000	1.1523
+++ ChangeLog	11 Sep 2005 16:06:34 -0000
@@ -1,3 +1,10 @@
+2005-09-10  Harish Krishnaswamy <kharish novell com>
+	
+	* data/Makefile.am : Do not add the version to the names of the
+	installed files (desktop, keys and mime file).
+	* data/evolution.desktop.in.in : Point to the symlink 'evolution'
+	and drop the version in Exec.
+
 2005-09-05  Mengjie Yu  <meng-jie yu sun com>
 
 	* configure.in:grep on Solaris doesn't support -q, use > /dev/null instead.
Index: data/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/data/Makefile.am,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile.am
--- data/Makefile.am	22 Feb 2005 18:18:54 -0000	1.23
+++ data/Makefile.am	11 Sep 2005 16:06:34 -0000
@@ -45,11 +45,11 @@ SUBDIRS = cde_app_root
 install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
 	$(mkinstalldirs) $(DESTDIR)$(desktopdir);							\
 	$(INSTALL_DATA) $(desktop_file)									\
-			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ;	\
+			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop) ;	\
 	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
-	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
+	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys) ;	\
 	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
-	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
+	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime) ;
 
 uninstall-local: uninstall-kde-applnk
 	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; 	\
Index: data/evolution.desktop.in.in
===================================================================
RCS file: /cvs/gnome/evolution/data/evolution.desktop.in.in,v
retrieving revision 1.9
diff -u -p -r1.9 evolution.desktop.in.in
--- data/evolution.desktop.in.in	16 Jun 2005 13:37:36 -0000	1.9
+++ data/evolution.desktop.in.in	11 Sep 2005 16:06:34 -0000
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 _Name=Evolution
 _Comment=The Evolution Groupware Suite
-Exec=evolution- BASE_VERSION@
+Exec=evolution
 Icon=evolution
 Terminal=false
 Type=Application