[grisbi-cvs] [SCM] grisbi branch, grisbi-0.8.x, updated. upstream_version_0_8_6-4-g257ead8

[chtibzh]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, grisbi-0.8.x has been updated
       via  257ead886668c35e0387aae67ff47fffd7f1df88 (commit)
       via  06a15933b802bdb72ba19c23808014f3cc67d429 (commit)
       via  1b95adab06dadefbdf37db2977fe8ea91b03cc9c (commit)
      from  bdacc0c1f3a0308f33601156cc65ba3a4be52b01 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 257ead886668c35e0387aae67ff47fffd7f1df88
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date:   Sun Jun 5 22:10:48 2011 +0200

    0.8.7

commit 06a15933b802bdb72ba19c23808014f3cc67d429
Merge: 1b95adab06dadefbdf37db2977fe8ea91b03cc9c bdacc0c1f3a0308f33601156cc65ba3a4be52b01
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date:   Sun Jun 5 21:54:57 2011 +0200

    Merge branch 'grisbi-0.8.x' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi into grisbi-0.8.x

commit 1b95adab06dadefbdf37db2977fe8ea91b03cc9c
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date:   Wed May 25 22:26:12 2011 +0200

    move to win32 gtk 2.18 and zlib 1.2.5

-----------------------------------------------------------------------

Changes:
diff --git a/win32-mingw/CMakeLists.txt b/win32-mingw/CMakeLists.txt
index 58a1142..a9a881a 100644
--- a/win32-mingw/CMakeLists.txt
+++ b/win32-mingw/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/target/${PlateformName}/plugins)
 SET(PACKAGE_NAME grisbi)
 set (grisbi_MAJOR 0)
 set (grisbi_MINOR 8)
-set (grisbi_PATCH 4)
+set (grisbi_PATCH 7)
 set (grisbi_version "${grisbi_MAJOR}.${grisbi_MINOR}.${grisbi_PATCH} pour windows")
 MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH)
 MARK_AS_ADVANCED(grisbi_version)
diff --git a/win32-mingw/prepare_Win32.cmd b/win32-mingw/prepare_Win32.cmd
index c12feac..6d5f69a 100644
--- a/win32-mingw/prepare_Win32.cmd
+++ b/win32-mingw/prepare_Win32.cmd
@@ -5,7 +5,8 @@
 ::    Get this file name from http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/
 ::    Specify the BUNDLE file
 ::    Don't include the extension
-SET GTK_DEV_FILE_BASENAME=gtk+-bundle_2.22.1-20101227_win32
+SET GTK_DEV_FILE_BASENAME=gtk+-bundle_2.18.7-20100213_win32
+SET ZLIB_DEV_FILE_BASENAME%=zlib_1.2.5-2_win32
 SET LIBXML_FILE_BASENAME=libxml2-2.7.7.win32
 SET ICONV_FILE_BASENAME=iconv-1.9.2.win32
 SET OPENSSL_FILE_BASENAME=Win32OpenSSL-1_0_0d
@@ -83,11 +84,13 @@ echo openssl ok
 cd "%DOWNLOADS_DIR%"
 chcp 1252 && wget -nc http://sourceforge.net/projects/grisbi/files/dependancies/0.7/libofx_mingw.zip/download
 cd "%TARGET_DIR%"
-unzip -uo "%DOWNLOADS_DIR%\libofx_Win32.zip" -d plugins-dev
+unzip -uo "%DOWNLOADS_DIR%\libofx_mingw.zip" -d plugins-dev
 echo ofx ok
 
 cd "%DOWNLOADS_DIR%"
-chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/%GTK_DEV_FILE_BASENAME%.zip
+chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/%GTK_DEV_FILE_BASENAME%.zip
+chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/%ZLIB_DEV_FILE_BASENAME%.zip
+
 :: Checking if already unzipped
 :: If the readme file exists for this version, update the unzip
 cd "%TARGET_DIR%"
@@ -95,6 +98,7 @@ IF NOT EXIST gtk-dev (
 	echo GTK+ development files not present.
 	echo Unzipping the archive now...
 	unzip "%DOWNLOADS_DIR%\%GTK_DEV_FILE_BASENAME%" -d gtk-dev
+	unzip -uo "%DOWNLOADS_DIR%\%ZLIB_DEV_FILE_BASENAME%" -d gtk-dev
 	echo Done unzipping archive!
 )
 IF EXIST gtk-dev\%GTK_DEV_FILE_BASENAME%.README.txt (
diff --git a/win32-mingw/windows_installer.nsi b/win32-mingw/windows_installer.nsi
index 9ed9c23..527dbff 100644
--- a/win32-mingw/windows_installer.nsi
+++ b/win32-mingw/windows_installer.nsi
@@ -20,9 +20,9 @@
 !define PRODUCT "Grisbi" ;Name of the project
 !define MAJOR "0"        ;Major version number
 !define MINOR "8"        ;Minor version number
-!define PATCH "5"        ;Patch version number
-!define STAGE "win32 mingw with ofx"     ;Developement stage id (RC, beta, alpha)
-!define SMALL_STAGE "win32_mingw_with_ofx" ;Small dev stage id without spaces
+!define PATCH "7"        ;Patch version number
+!define STAGE "win32 mingw"     ;Developement stage id (RC, beta, alpha)
+!define SMALL_STAGE "win32_mingw" ;Small dev stage id without spaces
 !define EXE_PATH "target\Win32" ;Path to the exe file you want to pack
 !define PLUGINS_DEV_PATH "target\Win32\plugins-dev" ;Path to the plugins-dev generated by prepare.cmd
 !define GTK_DEV_PATH "target\Win32\gtk-dev" ;Path to the gtk-dev generated by prepare.cmd
@@ -136,7 +136,6 @@ Section $(ProgFiles)
   File "${EXE_PATH}\grisbi.exe"
   File "${EXE_PATH}\*.dll"
   File ..\win32\grisbi.ico
-  File ..\win32\grisbi.ico
 
   SetOutPath "$INSTDIR\lib"
   File /r /x Makefile.am /x Makefile.in /x *.lib "${EXE_PATH}\lib\*.*"


hooks/post-receive
-- 
grisbi