[gcompris] windows installer: now we properly erase all our files at unistallation time

[Bruno Coudoin <bcoudoin src gnome org>]

commit 56038822e9ec75fef451d020f516e93a13268bf6
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Thu Dec 29 21:09:15 2011 +0100

    windows installer: now we properly erase all our files at unistallation time

 Makefile.mingw.in                 |    3 +--
 config.h.mingw.in                 |    2 +-
 gcompris-installer.nsi.in         |   29 ++++++++++++-----------------
 tools/create_nsis_translations.pl |    2 +-
 4 files changed, 15 insertions(+), 21 deletions(-)
---
diff --git a/Makefile.mingw.in b/Makefile.mingw.in
index 0945a0a..5eb8478 100644
--- a/Makefile.mingw.in
+++ b/Makefile.mingw.in
@@ -98,8 +98,7 @@ NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC2.dll \
 NEEDED_FILES =		README \
 	     		README.mingw \
 	     		README.translators \
-			COPYING \
-			ChangeLog
+			COPYING
 
 ##
 ##
diff --git a/config.h.mingw.in b/config.h.mingw.in
index 4dd54a4..930501b 100644
--- a/config.h.mingw.in
+++ b/config.h.mingw.in
@@ -146,4 +146,4 @@
 #define ENABLE_BINRELOC 0
 
 /* There is different version of pycairo */
-#define PYCAIRO_VERSION 1000
+#define PYCAIRO_VERSION 101020
diff --git a/gcompris-installer.nsi.in b/gcompris-installer.nsi.in
index d42ff35..b0b0b2e 100644
--- a/gcompris-installer.nsi.in
+++ b/gcompris-installer.nsi.in
@@ -314,16 +314,14 @@ Section Uninstall
     Delete "$INSTDIR\gcompris.exe"
     Delete "$INSTDIR\${GCOMPRIS_UNINST_EXE}"
     Delete "$INSTDIR\COPYING"
-    Delete "$INSTDIR\Changelog"
     Delete "$INSTDIR\README"
     Delete "$INSTDIR\SDL.dll"
     Delete "$INSTDIR\SDL_mixer.dll"
-    Delete "$INSTDIR\_cairo.pyd"
-    Delete "$INSTDIR\_gtk.pyd"
+    Delete "$INSTDIR\cairo._cairo.pyd"
+    Delete "$INSTDIR\gtk._gtk.pyd"
     Delete "$INSTDIR\_hashlib.pyd"
     Delete "$INSTDIR\_socket.pyd"
     Delete "$INSTDIR\_ssl.pyd"
-    Delete "$INSTDIR\_sqlite.pyd"
     Delete "$INSTDIR\_tkinter.pyd"
     Delete "$INSTDIR\atk.pyd"
     Delete "$INSTDIR\bz2.pyd"
@@ -344,7 +342,6 @@ Section Uninstall
     Delete "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
     Delete "$INSTDIR\libglib-2.0-0.dll"
     Delete "$INSTDIR\libgmodule-2.0-0.dll"
-    Delete "$INSTDIR\libgnomecanvas-2-0.dll"
     Delete "$INSTDIR\libgobject-2.0-0.dll"
     Delete "$INSTDIR\libgthread-2.0-0.dll"
     Delete "$INSTDIR\libgtk-win32-2.0-0.dll"
@@ -359,12 +356,12 @@ Section Uninstall
     Delete "$INSTDIR\pango.pyd"
     Delete "$INSTDIR\pangocairo.pyd"
     Delete "$INSTDIR\pthreadGC.dll"
-    Delete "$INSTDIR\python24.dll"
-    Delete "$INSTDIR\python24.zip"
     Delete "$INSTDIR\select.pyd"
     Delete "$INSTDIR\setup.py"
     Delete "$INSTDIR\sqlite3.dll"
     Delete "$INSTDIR\unicodedata.pyd"
+    Delete "$INSTDIR\gio._gio.pyd"
+    Delete "$INSTDIR\glib._glib.pyd"
     Delete "$INSTDIR\xmlparse.dll"
     Delete "$INSTDIR\xmltok.dll"
     Delete "$INSTDIR\zlib.pyd"
@@ -374,7 +371,7 @@ Section Uninstall
     Delete "$INSTDIR\libexpat.dll"
     Delete "$INSTDIR\libgio-2.0-0.dll"
     Delete "$INSTDIR\libogg-0.dll"
-    Delete "$INSTDIR\libpng12-0.dll"
+    Delete "$INSTDIR\libpng14-14.dll"
     Delete "$INSTDIR\libvorbis-0.dll"
     Delete "$INSTDIR\libvorbisfile-3.dll"
     Delete "$INSTDIR\pthreadGC2.dll"
@@ -390,26 +387,24 @@ Section Uninstall
     Delete "$INSTDIR\libgsf-1-114.dll"
     Delete "$INSTDIR\libjpeg-7.dll"
     Delete "$INSTDIR\libogg-0.dll"
-    Delete "$INSTDIR\libpng12-0.dll"
     Delete "$INSTDIR\librsvg-2-2.dll"
     Delete "$INSTDIR\libvorbis-0.dll"
     Delete "$INSTDIR\libvorbisfile-3.dll"
     Delete "$INSTDIR\libxml2-2.dll"
     Delete "$INSTDIR\pthreadGC2.dll"
-    Delete "$INSTDIR\python26.dll"
-    Delete "$INSTDIR\python26.zip"
+    Delete "$INSTDIR\python27.dll"
+    Delete "$INSTDIR\python27.zip"
     Delete "$INSTDIR\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
     Delete "$INSTDIR\Microsoft.VC90.CRT\msvcm90.dll"
     Delete "$INSTDIR\Microsoft.VC90.CRT\msvcp90.dll"
     Delete "$INSTDIR\Microsoft.VC90.CRT\msvcr90.dll"
     RMDir  "$INSTDIR\Microsoft.VC90.CRT"
-    Delete "$INSTDIR\manifest\gtk+-bundle_2.18.5-20091215_win32.mft"
+    Delete "$INSTDIR\manifest\gtk+-bundle_2.24.8-20111122_win32.mft"
     Delete "$INSTDIR\manifest\libcroco_0.6.2-1_win32.mft"
-    Delete "$INSTDIR\manifest\libgsf_1.14.15-1_win32.mft"
-    Delete "$INSTDIR\manifest\librsvg_2.26.0-1_win32.mft"
-    Delete "$INSTDIR\manifest\librsvg-dev_2.26.0-1_win32.mft"
-    Delete "$INSTDIR\manifest\svg-gdk-pixbuf-loader_2.26.0-1_win32.mft"
-    Delete "$INSTDIR\manifest\svg-gtk-engine_2.26.0-1_win32.mft"
+    Delete "$INSTDIR\manifest\libgsf_1.14.17-1_win32.mft"
+    Delete "$INSTDIR\manifest\librsvg_2.32.1-1_win32.mft"
+    Delete "$INSTDIR\manifest\librsvg-dev_2.32.1-1_win32.mft"
+    Delete "$INSTDIR\manifest\svg-gdk-pixbuf-loader_2.32.1-1_win32.mft"
     RMDir  "$INSTDIR\manifest"
 
     ;Try to remove GCompris install dir .. if empty
diff --git a/tools/create_nsis_translations.pl b/tools/create_nsis_translations.pl
index 3fdb547..a1f1a1d 100755
--- a/tools/create_nsis_translations.pl
+++ b/tools/create_nsis_translations.pl
@@ -136,7 +136,7 @@ my %localeNames = (
   "sl" =>	["Slovenian", "WINDOWS-1250"],
 #  "so" =>	["Somali", "UTF-8"],
   "sq" =>	["Albanian", "WINDOWS-1252"],
-  "sr" =>	["Serbian", "WINDOWS-1250"],
+#  "sr" =>	["Serbian", "WINDOWS-1250"],
   "sv" =>	["Swedish", "WINDOWS-1252"],
 #  "ta" =>	["Tamil", "UTF-8"],
   "th" =>	["Thai", "WINDOWS-874"],