f-spot.desktop patch

[Gary Ekker <gekker novell com>]

Attached is a patch to add a .desktop file to f-spot, and install
f-spot-logo.png for the icon.

This adds "f-spot" as the menu entry, so if you want it to show
otherwise, it'll be easy to tweak. I have a cvs account if you would
prefer having me commit.

-Gary

? f-spot-desktop.patch
? f-spot.desktop
? f-spot.desktop.in
? f-spot.desktop.in.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/f-spot/ChangeLog,v
retrieving revision 1.632
diff -u -r1.632 ChangeLog
--- ChangeLog	24 Feb 2005 23:37:43 -0000	1.632
+++ ChangeLog	25 Feb 2005 03:53:54 -0000
@@ -1,3 +1,10 @@
+2005-02-24  Gary Ekker  <gekker novell com>
+
+	* f-spot.desktop.in.in: add file for .desktop menu-spec support
+	* Makefile.am: make f-spot.desktop installable
+	* configure.in: add f-spot.desktop.in to AC_OUTPUT
+	* icons/Makefile.am: make f-spot-logo.png installable
+
 2005-02-24  Larry Ewing  <lewing novell com>
 
 	* src/IconView.cs: use regions to compute the preload area.
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/f-spot/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- Makefile.am	15 Feb 2005 01:03:33 -0000	1.8
+++ Makefile.am	25 Feb 2005 03:53:54 -0000
@@ -7,6 +7,13 @@
 	po		\
 	src	
 
+desktop_in_files=f-spot.desktop.in
+desktop_files=$(desktop_in_files:.desktop.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
+Applicationsdir = $(datadir)/applications
+Applications_DATA = $(desktop_files)
+
 CLEANFILES =			\
 	intltool-extract	\
 	intltool-update		\
@@ -17,4 +24,13 @@
 	intltool-extract.in	\
 	intltool-merge.in	\
 	intltool-update.in	\
-	f-spot.spec
+	f-spot.spec		\
+        $(desktop_in_files)     \
+        $(desktop_files)
+
+DISTCLEANFILES = \
+        intltool-extract        \
+        intltool-merge          \
+        intltool-update         \
+        $(desktop_files)
+
Index: configure.in
===================================================================
RCS file: /cvs/gnome/f-spot/configure.in,v
retrieving revision 1.49
diff -u -r1.49 configure.in
--- configure.in	21 Feb 2005 13:18:15 -0000	1.49
+++ configure.in	25 Feb 2005 03:53:54 -0000
@@ -131,4 +131,5 @@
 src/f-spot.exe.config
 src/Makefile
 f-spot.spec
+f-spot.desktop.in
 ])
Index: icons/Makefile.am
===================================================================
RCS file: /cvs/gnome/f-spot/icons/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- icons/Makefile.am	24 Feb 2005 20:53:52 -0000	1.10
+++ icons/Makefile.am	25 Feb 2005 03:53:54 -0000
@@ -8,7 +8,6 @@
 	f-spot-fullscreen.png			\
 	f-spot-hidden.png			\
 	f-spot-loading.png			\
-	f-spot-logo.png				\
 	f-spot-other.png			\
 	f-spot-people.png			\
 	f-spot-places.png			\
@@ -19,5 +18,7 @@
 	f-spot-question-mark.png		\
 	f-spot-simple-white.css
 
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = f-spot-logo.png
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_DATA) $(pixmap_DATA)