[gnumeric] * http://live.gnome.org/GnomeGoals/CorrectDesktopFiles

[Jody Goldberg <jody src gnome org>]

commit d29de33f044888450e04d8f8bc68c08c86c900c4
Author: Jody Goldberg <jody gnome org>
Date:   Sat Nov 7 10:50:54 2009 -0500

    * http://live.gnome.org/GnomeGoals/CorrectDesktopFiles
    * make the _shell targets work

 NEWS                    |    4 ++++
 gnumeric.desktop.in     |    3 ++-
 tools/win32/Makefile.am |    4 ++--
 tools/win32/build       |    3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index fa238a9..2f85344 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ Gnumeric 1.9.16
 Jean:
 	* Fix cursor and cell edition on dark backgrounds. [#600656]
 
+Jody:
+	* turnkey win32 build on 32bit host.
+	* update desktop file to follow new guidelines.
+
 --------------------------------------------------------------------------
 Gnumeric 1.9.15
 
diff --git a/gnumeric.desktop.in b/gnumeric.desktop.in
index 87e614c..c2a7b8e 100644
--- a/gnumeric.desktop.in
+++ b/gnumeric.desktop.in
@@ -1,7 +1,8 @@
 [Desktop Entry]
 Version=1.0
-_Name=Gnumeric Spreadsheet
+_Name=Gnumeric
 _GenericName=Spreadsheet
+_X-GNOME-FullName=Gnumeric Spreadsheet
 _Comment=Calculation, Analysis, and Visualization of Information
 Exec=gnumeric %F_OR_U
 Icon=gnumeric
diff --git a/tools/win32/Makefile.am b/tools/win32/Makefile.am
index ab2d1ca..65c3860 100755
--- a/tools/win32/Makefile.am
+++ b/tools/win32/Makefile.am
@@ -7,10 +7,10 @@ release:: moduleset
 	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) release
 
 debug_shell:: moduleset
-	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) debug_shell
+	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) debug shell
 
 release_shell:: moduleset
-	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) debug_shell
+	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) release shell
 
 clean:
 	rm -rf debug release
diff --git a/tools/win32/build b/tools/win32/build
index 2bfa5b2..97a7499 100755
--- a/tools/win32/build
+++ b/tools/win32/build
@@ -8,6 +8,7 @@ py_pkg_ver=2.6.3
 builddir="$1"
 srcdir="$2"
 target="$3"
+is_shell="$4"
 
 if [ -z "${builddir}" -o -z "${srcdir}" -o -z "${target}" ]; then
     echo "usage  : $0 <builddir> <srcdir> <target>"
@@ -58,7 +59,7 @@ build_ls_s() {
     build_ls_s "${WINEDIR}/Python${py_ver}/libs/python${py_ver}.lib"	"lib/libpython${py_ver}.dll.a"
 
 # prep jhbuild files
-    ${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" # "-${target}"
+    ${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" "${is_shell}"
 
 ################################################################
 # TODO