Index: ./search/beagle-search.desktop.in.in
===================================================================
RCS file: ./search/beagle-search.desktop.in.in
diff -N ./search/beagle-search.desktop.in.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./search/beagle-search.desktop.in.in	3 Sep 2006 04:06:52 -0000
@@ -0,0 +1,16 @@
+[Desktop Entry]
+X-SuSE-translate=true
+_Name=Search
+_GenericName=Search
+_Comment=Search for data on your desktop
+Icon=system-search
+Exec=beagle-search
+Terminal=false
+Type=Application
+StartupNotify=true
+Encoding=UTF-8
+Categories=GNOME;GTK;Application;Core;Utility;Filesystem;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=beagle
+X-GNOME-Bugzilla-Component=General
+X-GNOME-Bugzilla-Version=@VERSION@
Index: ./search/Makefile.am
===================================================================
RCS file: /cvs/gnome/beagle/search/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- ./search/Makefile.am	22 Aug 2006 19:21:21 -0000	1.18
+++ ./search/Makefile.am	3 Sep 2006 04:06:52 -0000
@@ -9,6 +9,10 @@
 CSFLAGS += -define:ENABLE_OPEN_WITH
 endif
 
+if ENABLE_GALAGO
+CSFLAGS += -define:ENABLE_GALAGO
+endif
+
 pkglib_DATA = Search.exe Search.exe.mdb
 
 BIN_WRAPPERS = beagle-search
@@ -97,6 +101,8 @@
 Search.exe.mdb: Search.exe
 
 @INTLTOOL_DESKTOP_RULE@
+beagle-search.desktop.in:
+	sed -e "s|\@VERSION\@|$(VERSION)|g" < beagle-search.desktop.in.in > beagle-search.desktop.in
 
 desktop_in_files = beagle-search.desktop.in
 desktop_files = $(desktop_in_files:.desktop.in=.desktop)
@@ -105,7 +111,7 @@
 desktopdir       = $(datadir)/applications
 desktop_DATA     = $(desktop_files)
 
-all: $(BIN_WRAPPERS)
+all: $(BIN_WRAPPERS) beagle-search.desktop.in
 
 install-data-local: $(BIN_WRAPPERS)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -123,7 +129,8 @@
 	$(PAGES)		\
 	$(TRAY)			\
 	$(desktop_DATA).in	\
-	beagle-search.in
+	beagle-search.in	\
+	beagle-search.desktop.in
 
 CLEANFILES =			\
 	Search.exe		\
Index: ./tools/Makefile.am
===================================================================
RCS file: /cvs/gnome/beagle/tools/Makefile.am,v
retrieving revision 1.75
diff -u -r1.75 Makefile.am
--- ./tools/Makefile.am	19 Apr 2006 00:30:36 -0000	1.75
+++ ./tools/Makefile.am	3 Sep 2006 04:06:52 -0000
@@ -25,7 +25,8 @@
 	-e "s|\@sysconfdir\@|$(sysconfdir)|g"		\
 	-e "s|\@localstatedir\@|$(localstatedir)|g"     \
 	-e "s|\@gacprefix\@|$(GAC_PREFIX)|g"		\
-	-e "s|\@bash\@|$(BASH)|"
+	-e "s|\@bash\@|$(BASH)|g"			\
+	-e "s|\@VERSION\@|$(VERSION)|g"	
 
 CRAWL_WRAPPER = beagle-crawl-system
 CRAWL_WRAPPER_IN = $(CRAWL_WRAPPER).in
@@ -162,14 +163,18 @@
 @INTLTOOL_DESKTOP_RULE@
 
 if ENABLE_GUI
+beagle-settings.desktop.in: beagle-settings.desktop.in.in
+	  $(WRAPPER_SED)< beagle-settings.desktop.in.in > $@
+
 desktop_in_files = beagle-settings.desktop.in
 desktop_files = $(desktop_in_files:.desktop.in=.desktop)
 
+
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_files)
 endif
 
-all: $(TARGETS) $(WRAPPERS)
+all: $(TARGETS) $(WRAPPERS) beagle-settings.desktop.in
 
 install-data-local: $(TARGETS)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -216,7 +221,8 @@
 	beagle-index-info		\
 	beagle-ping			\
 	beagle-status			\
-	boot.inotify.init		
+	boot.inotify.init		\
+	beagle-settings.desktop.in	
 
 CLEANFILES = 				\
 	$(TARGETS)			\
Index: ./tools/beagle-settings.desktop.in.in
===================================================================
RCS file: ./tools/beagle-settings.desktop.in.in
diff -N ./tools/beagle-settings.desktop.in.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./tools/beagle-settings.desktop.in.in	3 Sep 2006 04:06:52 -0000
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+X-SuSE-translate=true
+_Name=Search & Indexing
+_GenericName=Configure Desktop Search & Indexing
+_Comment=Configure search & indexing properties
+Exec=beagle-settings
+Icon=gnome-searchtool
+Type=Application
+Categories=Application;Settings;AdvancedSettings;Utility;Filesystem;X-Ximian-Settings;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=beagle
+X-GNOME-Bugzilla-Component=General
+X-GNOME-Bugzilla-Version=@VERSION@
