[evolution-patches] .desktop files and component art install patches

[William Jon McCann <mccannwj pha jhu edu>]

Hi,

Here are two patches that add an item to the menus and install icons for 
each component.

This makes it much easier to access each component directly and 
integrates with the menus a bit better.

Please let me know if this is ok.

Thanks,
Jon

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1320
diff -p -u -r1.1320 ChangeLog
--- ChangeLog	2 Apr 2004 16:33:30 -0000	1.1320
+++ ChangeLog	2 Apr 2004 21:03:08 -0000
@@ -1,3 +1,11 @@
+2004-04-02  William Jon McCann  <mccann jhu edu>
+
+	* data/evolution-mail.desktop.in.in: 
+	* data/evolution-calendar.desktop.in.in: 
+	* data/evolution-addressbook.desktop.in.in: 
+	* data/evolution-tasks.desktop.in.in: 
+	* data/Makefile.am: install desktop files for each component.
+
 2004-04-02  JP Rosevear  <jpr ximian com>
 
 	* configure.in: bump version, requirements
Index: data/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/data/Makefile.am,v
retrieving revision 1.20
diff -p -u -r1.20 Makefile.am
--- data/Makefile.am	22 Jan 2004 20:55:04 -0000	1.20
+++ data/Makefile.am	2 Apr 2004 21:03:08 -0000
@@ -1,8 +1,11 @@
 desktopdir = $(datadir)/applications
-desktop_in_in_file = evolution.desktop.in.in
-desktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop)
+components = evolution-mail evolution-calendar evolution-tasks evolution-addressbook
+desktop_files = $(components:=.desktop)
+desktop_in_files = $(desktop_files:.desktop=.desktop.in)
+desktop_in_in_files = $(desktop_files:.desktop=.desktop.in.in)
+
 %.desktop.in: %.desktop.in.in
-	sed -e "s|\ BASE_VERSION\@|$(BASE_VERSION)|" $< > $@
+	sed -e "s|\ BASE_VERSION\@|$(BASE_VERSION)|g" $< > $@
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -10,7 +13,7 @@ keysdir = $(datadir)/mime-info
 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)|" $< > $@
+	sed -e "s|\ BASE_VERSION\@|$(BASE_VERSION)|g" $< > $@
 
 @INTLTOOL_KEYS_RULE@
 
@@ -20,12 +23,14 @@ mime_file = evolution.mime
 if HAVE_KDE_APPLNK
 
 kdedesktopdir = $(KDE_APPLNK_DIR)/Applications
-kdedesktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop)
+kdedesktop_files = $(desktop_files)
 
 install-kde-applnk:
 	$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir);	\
-	$(INSTALL_DATA) $(kdedesktop_file) \
-		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
+	for desktop_file in $(kdedesktop_files); do	\
+	base_name=`basename $$desktop_file .desktop`;	\
+	$(INSTALL_DATA) $$desktop_file $(DESTDIR)$(desktopdir)/$$base_name-$(BASE_VERSION).desktop;	\
+	done
 else
 
 install-kde-applnk:
@@ -33,14 +38,16 @@ install-kde-applnk:
 endif
 
 noinst_MANS = evolution.1
-noinst_DATA = $(keys_file) $(desktop_file)
+noinst_DATA = $(keys_file) $(desktop_files)
 
 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) ;	\
+install-data-local: install-kde-applnk $(desktop_files) $(keys_file) $(mime_file)
+	-$(mkinstalldirs) $(DESTDIR)$(desktopdir);
+	-for desktop_file in $(desktop_files); do 							\
+	base_name=`basename $$desktop_file .desktop`; 							\
+	$(INSTALL_DATA) $$desktop_file $(DESTDIR)$(desktopdir)/$$base_name-$(BASE_VERSION).desktop; 	\
+	done
 	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
 	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
 	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
@@ -61,9 +68,13 @@ dtappunintegrate:
 endif
 
 EXTRA_DIST =					\
-	$(desktop_in_in_file)			\
+	$(desktop_in_in_files)			\
 	$(mime_file)				\
 	$(keys_file)				\
 	$(keys_in_file)				\
 	$(noinst_MANS)
+
+CLEANFILES = 					\
+	$(desktop_files)			\
+	$(keys_file)
 
--- /dev/null	2003-09-15 09:40:47.000000000 -0400
+++ data/evolution-mail.desktop.in.in	2004-04-02 14:22:02.000000000 -0500
@@ -0,0 +1,12 @@
+[Desktop Entry]
+_Name=Evolution Mail (Unstable)
+_Comment=Groupware Mail
+Exec=evolution- BASE_VERSION@ -c OAFIID:GNOME_Evolution_Mail_Component:@BASE_VERSION@
+Icon=evolution-mail- BASE_VERSION@.png
+Terminal=false
+Type=Application
+Categories=GNOME;Application;Network;X-Red-Hat-Base;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=Ximian
+X-GNOME-Bugzilla-Product=evolution
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.0;evolution-alarm-notify;
--- /dev/null	2003-09-15 09:40:47.000000000 -0400
+++ data/evolution-calendar.desktop.in.in	2004-04-02 14:22:12.000000000 -0500
@@ -0,0 +1,12 @@
+[Desktop Entry]
+_Name=Evolution Calendar (Unstable)
+_Comment=Groupware Calendar
+Exec=evolution- BASE_VERSION@ -c OAFIID:GNOME_Evolution_Calendar_Component:@BASE_VERSION@
+Icon=evolution-calendar- BASE_VERSION@.png
+Terminal=false
+Type=Application
+Categories=GNOME;Application;Office;X-Red-Hat-Base;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=Ximian
+X-GNOME-Bugzilla-Product=evolution
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.0;evolution-alarm-notify;
--- /dev/null	2003-09-15 09:40:47.000000000 -0400
+++ data/evolution-addressbook.desktop.in.in	2004-04-02 16:01:15.000000000 -0500
@@ -0,0 +1,12 @@
+[Desktop Entry]
+_Name=Evolution Address Book (Unstable)
+_Comment=Groupware Address Book
+Exec=evolution- BASE_VERSION@ -c OAFIID:GNOME_Evolution_Addressbook_Component:@BASE_VERSION@
+Icon=evolution-addressbook- BASE_VERSION@.png
+Terminal=false
+Type=Application
+Categories=GNOME;Application;Office;X-Red-Hat-Base;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=Ximian
+X-GNOME-Bugzilla-Product=evolution
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.0;evolution-alarm-notify;
--- /dev/null	2003-09-15 09:40:47.000000000 -0400
+++ data/evolution-tasks.desktop.in.in	2004-04-02 14:21:40.000000000 -0500
@@ -0,0 +1,12 @@
+[Desktop Entry]
+_Name=Evolution Tasks (Unstable)
+_Comment=Groupware Tasks
+Exec=evolution- BASE_VERSION@ -c OAFIID:GNOME_Evolution_Tasks_Component:@BASE_VERSION@
+Icon=evolution-tasks- BASE_VERSION@.png
+Terminal=false
+Type=Application
+Categories=GNOME;Application;Office;X-Red-Hat-Base;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=Ximian
+X-GNOME-Bugzilla-Product=evolution
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.0;evolution-alarm-notify;

Index: art/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/art/ChangeLog,v
retrieving revision 1.170
diff -p -u -r1.170 ChangeLog
--- art/ChangeLog	9 Mar 2004 11:11:09 -0000	1.170
+++ art/ChangeLog	2 Apr 2004 21:05:20 -0000
@@ -1,3 +1,7 @@
+2004-04-02  William Jon McCann  <mccann jhu edu>
+
+	* Makefile.am (install-data-local): install icons for each component.
+
 2004-03-09  Jakub Steiner <jimmac ximian com>
 
 	* autocompletion.png:
Index: art/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/art/Makefile.am,v
retrieving revision 1.116
diff -p -u -r1.116 Makefile.am
--- art/Makefile.am	9 Mar 2004 11:11:09 -0000	1.116
+++ art/Makefile.am	2 Apr 2004 21:05:20 -0000
@@ -262,6 +262,10 @@ conduits_DATA =				\
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
 	$(INSTALL_DATA) $(srcdir)/evolution.png  $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
+	$(INSTALL_DATA) $(srcdir)/evolution-inbox.png  $(DESTDIR)$(datadir)/pixmaps/evolution-mail-$(BASE_VERSION).png
+	$(INSTALL_DATA) $(srcdir)/evolution-calendar.png  $(DESTDIR)$(datadir)/pixmaps/evolution-calendar-$(BASE_VERSION).png
+	$(INSTALL_DATA) $(srcdir)/evolution-contacts.png  $(DESTDIR)$(datadir)/pixmaps/evolution-addressbook-$(BASE_VERSION).png
+	$(INSTALL_DATA) $(srcdir)/evolution-tasks.png  $(DESTDIR)$(datadir)/pixmaps/evolution-tasks-$(BASE_VERSION).png
 if DEFAULT_BINARY
 	cd $(DESTDIR)$(datadir)/pixmaps && rm -f evolution.png && $(LN_S) evolution-$(BASE_VERSION).png evolution.png
 endif