Firebird

Build Version :  T2.5.0.18038 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18198 2008/01/22 14:38:26 paulbeach E )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16910/src/jrd

Modified Files:
	unicode_util.cpp 
Log Message:
Assert Failure on MacOS - adjustment

Index: unicode_util.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/unicode_util.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -U3 -r1.26 -r1.27
--- unicode_util.cpp	18 Jan 2008 09:23:40 -0000	1.26
+++ unicode_util.cpp	22 Jan 2008 14:38:23 -0000	1.27
@@ -25,12 +25,12 @@
  */
 
 #include "firebird.h"
+#include "../common/classes/alloc.h"
 #include "../jrd/constants.h"
 #include "../jrd/unicode_util.h"
 #include "../jrd/CharSet.h"
 #include "../jrd/IntlUtil.h"
 #include "../jrd/gdsassert.h"
-#include "../common/classes/alloc.h"
 #include "../common/classes/auto.h"
 #include "../common/classes/GenericMap.h"
 #include "../common/classes/init.h"

Build Version :  T2.5.0.18037 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18197 2008/01/22 14:20:11 paulbeach E )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6091/src/jrd

Modified Files:
      Tag: B2_1_Release
	unicode_util.cpp 
Log Message:
Assert Failure on MacOS - adjustment

Index: unicode_util.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/unicode_util.cpp,v
retrieving revision 1.24.4.1
retrieving revision 1.24.4.2
diff -b -U3 -r1.24.4.1 -r1.24.4.2
--- unicode_util.cpp	18 Jan 2008 09:23:01 -0000	1.24.4.1
+++ unicode_util.cpp	22 Jan 2008 14:20:03 -0000	1.24.4.2
@@ -25,12 +25,12 @@
  */
 
 #include "firebird.h"
+#include "../common/classes/alloc.h"
 #include "../jrd/constants.h"
 #include "../jrd/unicode_util.h"
 #include "../jrd/CharSet.h"
 #include "../jrd/IntlUtil.h"
 #include "../jrd/gdsassert.h"
-#include "../common/classes/alloc.h"
 #include "../common/classes/auto.h"
 #include "../common/classes/GenericMap.h"
 #include "../common/classes/init.h"

Build Version :  T2.5.0.18036 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18196 2008/01/22 13:54:29 paul_reeves )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28175

Modified Files:
      Tag: B2_1_Release
	BuildExecutableInstall.bat 
Log Message:
Allow snapshots to build without dependencies upon wix and external documentation

Index: BuildExecutableInstall.bat
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/BuildExecutableInstall.bat,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -b -U3 -r1.33.2.1 -r1.33.2.2
--- BuildExecutableInstall.bat	22 Jan 2008 08:05:51 -0000	1.33.2.1
+++ BuildExecutableInstall.bat	22 Jan 2008 13:54:26 -0000	1.33.2.2
@@ -98,18 +98,6 @@
 :: Make sure we have everything we need. If something is missing then
 :: let's bail out now.
 
-if not DEFINED FB_EXTERNAL_DOCS (
- @echo.
- @echo The FB_EXTERNAL_DOCS environment var is not defined
- @echo It should point to the directory containing the relevant release notes
- @echo in adobe pdf format.
- @echo.
- @echo Subsequent script execution will be cancelled.
- @echo.
- cancel_script > nul 2>&1
- goto :EOF
-)
-
 sed --version | findstr version > nul
 @if %ERRORLEVEL% GEQ 1 (
 	call :ERROR Could not locate sed
@@ -131,10 +119,29 @@
   ) else (@echo     o Inno Setup found at %INNO5_SETUP_PATH%.)
 )
 
+:: If we are not building a snapshot we must check for WIX and
+:: the path to the external documentation. If we are building a
+:: snapshot then we can ignore them.
+if not defined FB2_SNAPSHOT (
+
 if not defined WIX (
 	call :ERROR WIX not defined. WiX is needed to build the MSI kits of the CRT runtimes.
 	@goto :EOF
   ) else (@echo     o WiX found at %WIX%.)
+
+
+if not DEFINED FB_EXTERNAL_DOCS (
+ @echo.
+ @echo The FB_EXTERNAL_DOCS environment var is not defined
+ @echo It should point to the directory containing the relevant release notes
+ @echo in adobe pdf format.
+ @echo.
+ @echo Subsequent script execution will be cancelled.
+ @echo.
+ cancel_script > nul 2>&1
+ goto :EOF
+)
+
 )
 
 ::End of CHECK_ENVIRONMENT
@@ -310,11 +317,16 @@
 @copy %FB_ROOT_PATH%\doc\sql.extensions\*.* %FB_OUTPUT_DIR%\doc\sql.extensions\ > nul
 @if %ERRORLEVEL% GEQ 1 ( (call :ERROR Copying doc\sql.extensions failed  ) & (goto :EOF))
 
+:: External docs aren't necessary for a snapshot build, so we don't throw
+:: an error if FB_EXTERNAL_DOCS is not defined. On the other hand,
+:: if the docs are available then we can include them.
+if defined FB_EXTERNAL_DOCS (
 @echo   Copying pdf docs...
 @for %%v in ( Firebird-2.0-QuickStart.pdf Firebird_v1.5.4.ReleaseNotes.pdf Firebird_v2.0.3.ReleaseNotes.pdf Firebird_v2.1.0.ReleaseNotes.pdf Firebird_v2.1.0.InstallationGuide.pdf Firebird_v2.1.0.BugFixes.pdf) do (
   @echo     ... %%v
   (@copy /Y %FB_EXTERNAL_DOCS%\%%v %FB_OUTPUT_DIR%\doc\%%v > nul) || (call :WARNING Copying %FB_EXTERNAL_DOCS%\%%v failed.)
 )
+)
 
 :: Clean out text notes that are either not relevant to Windows or
 :: are only of use to engine developers.
@@ -359,7 +371,7 @@
 
 :BUILD_CRT_MSI
 :: Generate runtimes as an MSI file.
-:: This requires WiX to be installed
+:: This requires WiX 2.0 to be installed
 ::============
 if %MSVC_VERSION% GEQ 8 (
 if not exist %FB_OUTPUT_DIR%\system32\vccrt%MSVC_VERSION%_%FB_TARGET_PLATFORM%.msi (
@@ -767,6 +779,9 @@
 @Echo.
 
 if defined WIX (
+:: WIX is not necessary for a snapshot build, so we don't throw
+:: an error if WIX is not defined. On the other hand,
+:: if it is there anyway, use it.
 @Echo   Building MSI runtimes
 @call :BUILD_CRT_MSI ) || (@echo Error calling BUILD_CRT_MSI & @goto :EOF)
 @Echo.

Build Version :  T2.5.0.18035 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18195 2008/01/22 11:39:59 alexpeshkof )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/linux/misc
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1715

Modified Files:
      Tag: B2_1_Release
	firebird.init.d.mandrake.in 
Log Message:
Fixed RC1 regression - SS does not start on Mandriva

Index: firebird.init.d.mandrake.in
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -b -U3 -r1.7 -r1.7.2.1
--- firebird.init.d.mandrake.in	26 Nov 2007 15:41:34 -0000	1.7
+++ firebird.init.d.mandrake.in	22 Jan 2008 11:39:13 -0000	1.7.2.1
@@ -25,18 +25,18 @@
 pidfile=/var/run/firebird/$INSTANCE.pid
 FULLNAME="Firebird server [$INSTANCE]"
 LD_LIBRARY_PATH=$FIREBIRD/lib
+MANAGER=$FIREBIRD/bin/fbmgr.bin
 
 export FIREBIRD LD_LIBRARY_PATH
 
 # Check the file is there and is executable.
-[ -x $FIREBIRD/bin/fbmgr.bin ] || exit 1
+[ -x $MANAGER ] || exit 1
 
 # See how we were called.
 case "$1" in
   start)
 	echo -n "Starting $FULLNAME "
-
-	runuser -s /bin/bash $FBRunUser -c "$FIREBIRD/bin/fbmgr.bin -pidfile $pidfile -start -forever"
+	echo $MANAGER -pidfile $pidfile -start -forever | su $FBRunUser
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && success || failure
 	echo

Build Version :  T2.5.0.18034 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18194 2008/01/22 11:08:17 robocop Exp )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19929/builds/install/arch-specific/win32

Modified Files:
	FirebirdInstall_20.iss Readme.txt 
Log Message:
Misc.

Index: FirebirdInstall_20.iss
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/FirebirdInstall_20.iss,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -U3 -r1.29 -r1.30
--- FirebirdInstall_20.iss	22 Dec 2007 00:53:34 -0000	1.29
+++ FirebirdInstall_20.iss	22 Jan 2008 11:08:13 -0000	1.30
@@ -378,7 +378,7 @@
 Name: {group}\Firebird Server; Filename: {app}\bin\fbserver.exe; Parameters: -a; Flags: runminimized; MinVersion: 4.0,4.0;  Check: InstallServerIcon; IconIndex: 0; Components: ServerComponent\SuperServerComponent; Comment: Run Firebird Superserver (without guardian)
 Name: {group}\Firebird Guardian; Filename: {app}\bin\fbguard.exe; Parameters: -a; Flags: runminimized; MinVersion: 4.0,4.0;  Check: InstallGuardianIcon; IconIndex: 1; Components: ServerComponent\SuperServerComponent; Comment: Run Firebird Super Server (with guardian)
 Name: {group}\Firebird ISQL Tool; Filename: {app}\bin\isql.exe; WorkingDir: {app}; MinVersion: 4.0,4.0;  Comment: {cm:RunISQL}
-Name: {group}\Firebird 2.1.0 Release Notes; Filename: {app}\doc\Firebird_v2.1.0.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
+Name: {group}\Firebird 2.5.0 Release Notes; Filename: {app}\doc\Firebird_v2.5.0.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
 Name: {group}\Firebird 2.0.3 Release Notes; Filename: {app}\doc\Firebird_v2.0.1.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
 Name: {group}\Firebird 1.5.4 Release Notes; Filename: {app}\doc\Firebird_v1.5.4.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
 Name: {group}\Firebird 2.0 Quick Start Guide; Filename: {app}\doc\Firebird-2.0-QuickStart.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName}

Index: Readme.txt
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/Readme.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -U3 -r1.15 -r1.16
--- Readme.txt	15 Oct 2007 05:53:31 -0000	1.15
+++ Readme.txt	22 Jan 2008 11:08:13 -0000	1.16
@@ -1,6 +1,6 @@
 
 ====================================
-Firebird 2.1.0       (Windows Build)
+Firebird 2.5.0       (Windows Build)
 ====================================
 
   *** Beta 2 ***
@@ -16,7 +16,7 @@
 Introduction
 ============
 
-Welcome to the second beta release of Firebird 2.1
+Welcome to the ... release of Firebird 2.5
 
 
 Intended Users
@@ -74,7 +74,7 @@
 
 Please don't use the Firebird-devel list for technical
 support unless the question specifically relates to a
-new feature in Firebird 2.1
+new feature in Firebird 2.5
 
 
 Happy Testing!

Build Version :  T2.5.0.18034 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18194 2008/01/22 11:08:17 robocop Exp )

Update of /cvsroot/firebird/firebird2/builds/posix
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19929/builds/posix

Modified Files:
	prefix.darwin_x86_64 
Log Message:
Misc.

Index: prefix.darwin_x86_64
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/posix/prefix.darwin_x86_64,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -U3 -r1.3 -r1.4
--- prefix.darwin_x86_64	18 Jan 2008 15:13:39 -0000	1.3
+++ prefix.darwin_x86_64	22 Jan 2008 11:08:20 -0000	1.4
@@ -15,7 +15,7 @@
 # All Rights Reserved.
 # Contributor(s): ______________________________________.
 # Start of file prefix.darwin:	$(VERSION)	@PLATFORM@
-#$Id$
+
 # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
 
 # To use this file to build 64bit version of Firebird for MacOS 10.5 (Leopard)
@@ -46,7 +46,7 @@
 LD_FLAGS+=-arch x86_64
 LIB_BUNDLE_OPTIONS:=$(LD_FLAGS) -bundle -flat_namespace -undefined suppress
 LIB_LINK_OPTIONS:=$(LD_FLAGS) -dynamiclib -flat_namespace
-LIB_LINK_SONAME:=-current_version 2.1.0 -compatibility_version 2.1.0 -seg1addr 0x30000000
+LIB_LINK_SONAME:=-current_version 2.5.0 -compatibility_version 2.5.0 -seg1addr 0x30000000
 LIB_LINK_MAPFILE:=-Wl,-exported_symbols_list,
 LINK_FIREBIRD_EMBED_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.darwin.embed.vers
 LINK_FIREBIRD_CLIENT_SYMBOLS=$(LIB_LINK_MAPFILE)$(ROOT)/builds/posix/firebird.darwin.client.vers

Build Version :  T2.5.0.18033 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18193 2008/01/22 10:30:21 robocop Exp )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/darwin
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv4908/builds/install/arch-specific/darwin

Modified Files:
	install-script 
Log Message:
Misc.

Index: install-script
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/darwin/install-script,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -U3 -r1.9 -r1.10
--- install-script	22 Jan 2008 09:40:41 -0000	1.9
+++ install-script	22 Jan 2008 10:30:18 -0000	1.10
@@ -197,7 +197,7 @@
 
 # inetd.d - older versions of MacOS
 echo "Test inetd"
-if [ -f /var/run/inted.pid -a -d /etc/inetd.d ]; then
+if [ -f /var/run/inetd.pid -a -d /etc/inetd.d ]; then
 	if [ -f /etc/inetd.conf ]; then
 	echo "gds_db stream  tcp     nowait  root $FB_FW/Resources/bin/fb_inet_server fb_inet_server" > /etc/.fb.inetd.conf.entry
 	cat /etc/inetd.conf /etc/.fb.inetd.conf.entry > /etc/.interbase.temp.install.inetd.conf

Build Version :  T2.5.0.18033 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18193 2008/01/22 10:30:21 robocop Exp )

Update of /cvsroot/firebird/firebird2/doc
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv4908/doc

Modified Files:
	README.UserSql 
Log Message:
Misc.

Index: README.UserSql
===================================================================
RCS file: /cvsroot/firebird/firebird2/doc/README.UserSql,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -U3 -r1.2 -r1.3
--- README.UserSql	16 Jan 2008 08:37:44 -0000	1.2
+++ README.UserSql	22 Jan 2008 10:30:23 -0000	1.3
@@ -24,6 +24,6 @@
  Non-privileged (non-SYSDBA) user can use only ALTER USER operator with his own name 
  as name parameter in it.
 
- WARNING! This operators are not under transaction control!
+ WARNING! These operators are not under transaction control!
  That means that changes take place in security database at once after execution of a request,
  not waiting for COMMIT, and can not be rolled back.

Build Version :  T2.5.0.18032 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18192 2008/01/22 10:09:44 robocop Exp )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/pl
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28657/builds/install/arch-specific/win32/pl

Modified Files:
      Tag: B2_1_Release
	custom_messages_pl.inc 
Log Message:
Misc.

Index: custom_messages_pl.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/pl/custom_messages_pl.inc,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -b -U3 -r1.3.4.1 -r1.3.4.2
--- custom_messages_pl.inc	22 Jan 2008 08:06:22 -0000	1.3.4.1
+++ custom_messages_pl.inc	22 Jan 2008 10:09:40 -0000	1.3.4.2
@@ -51,7 +51,7 @@
 pl.PreviousInstallBroken=   (Instalacja wygl¹da na b³êdn¹, z powodu konfliktu wersji.)
 pl.PreviousInstallGood=   (Instalacja wygl¹da na poprawn¹.)
 
-pl.IconReadme=Firebird 2.0 - przeczytaj mnie
+pl.IconReadme=Firebird 2.1 - przeczytaj mnie
 pl.IconUninstall=Deinstalacja Firebird'a
 pl.ReleaseNotes= Informacje o wydaniu. (Wymagany Acrobat Reader.)
 pl.InstallationGuide= installation guide. (Wymagany Acrobat Reader.)

Build Version :  T2.5.0.18031 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18191 2008/01/22 09:40:43 paulbeach E )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/darwin
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16265/builds/install/arch-specific/darwin

Modified Files:
	install-script 
Log Message:
Minor Mods

Index: install-script
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/darwin/install-script,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -U3 -r1.8 -r1.9
--- install-script	22 Dec 2007 00:53:31 -0000	1.8
+++ install-script	22 Jan 2008 09:40:41 -0000	1.9
@@ -149,6 +149,7 @@
 
     chmod a+s "$FB_FW/Resources/bin/gds_drop"
     chmod a+s "$FB_FW/Resources/bin/fb_lock_mgr"
+    chown root "$FB_FW/Resources/bin/fb_lock_mgr"
     chmod a+s "$FB_FW/Resources/bin/fb_inet_server"
 fi
 
@@ -196,7 +197,7 @@
 
 # inetd.d - older versions of MacOS
 echo "Test inetd"
-if [ -f //var/run/inted.pid -a -d /etc/inetd.d ]; then
+if [ -f /var/run/inted.pid -a -d /etc/inetd.d ]; then
 	if [ -f /etc/inetd.conf ]; then
 	echo "gds_db stream  tcp     nowait  root $FB_FW/Resources/bin/fb_inet_server fb_inet_server" > /etc/.fb.inetd.conf.entry
 	cat /etc/inetd.conf /etc/.fb.inetd.conf.entry > /etc/.interbase.temp.install.inetd.conf

Build Version :  T2.5.0.18030 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18190 2008/01/22 09:38:32 paulbeach E )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/darwin
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15410/builds/install/arch-specific/darwin

Modified Files:
      Tag: B2_1_Release
	install-script 
Log Message:
Minor Mods

Index: install-script
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/darwin/install-script,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -b -U3 -r1.8 -r1.8.2.1
--- install-script	22 Dec 2007 00:53:31 -0000	1.8
+++ install-script	22 Jan 2008 09:38:30 -0000	1.8.2.1
@@ -149,6 +149,7 @@
 
     chmod a+s "$FB_FW/Resources/bin/gds_drop"
     chmod a+s "$FB_FW/Resources/bin/fb_lock_mgr"
+    chown root "$FB_FW/Resources/bin/fb_lock_mgr"
     chmod a+s "$FB_FW/Resources/bin/fb_inet_server"
 fi
 
@@ -196,7 +197,7 @@
 
 # inetd.d - older versions of MacOS
 echo "Test inetd"
-if [ -f //var/run/inted.pid -a -d /etc/inetd.d ]; then
+if [ -f /var/run/inetd.pid -a -d /etc/inetd.d ]; then
 	if [ -f /etc/inetd.conf ]; then
 	echo "gds_db stream  tcp     nowait  root $FB_FW/Resources/bin/fb_inet_server fb_inet_server" > /etc/.fb.inetd.conf.entry
 	cat /etc/inetd.conf /etc/.fb.inetd.conf.entry > /etc/.interbase.temp.install.inetd.conf

Build Version :  T2.5.0.18029 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18189 2008/01/22 09:37:45 paulbeach E )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/darwin
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14997/builds/install/arch-specific/darwin

Modified Files:
      Tag: B2_0_Release
	install-script 
Log Message:
Minor Mods

Index: install-script
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/darwin/install-script,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -b -U3 -r1.1.2.9 -r1.1.2.10
--- install-script	4 Jan 2008 13:06:28 -0000	1.1.2.9
+++ install-script	22 Jan 2008 09:37:42 -0000	1.1.2.10
@@ -151,6 +151,7 @@
 
     chmod a+s "$FB_FW/Resources/bin/gds_drop"
     chmod a+s "$FB_FW/Resources/bin/fb_lock_mgr"
+    chown root "$FB_FW/Resources/bin/fb_lock_mgr"
     chmod a+s "$FB_FW/Resources/bin/fb_inet_server"
 fi

Build Version :  T2.5.0.18028 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18188 2008/01/22 08:06:22 paul_reeves )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/pt
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10822/pt

Modified Files:
      Tag: B2_1_Release
	custom_messages_pt.inc 
Log Message:
minor changes required to bring the windows installer up to date for 2.1

Index: custom_messages_pt.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/pt/custom_messages_pt.inc,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -b -U3 -r1.4 -r1.4.8.1
--- custom_messages_pt.inc	6 Dec 2006 05:52:25 -0000	1.4
+++ custom_messages_pt.inc	22 Jan 2008 08:06:26 -0000	1.4.8.1
@@ -1,4 +1,4 @@
-pt.MyAppName=Servidor SQL Firebird 2.0
+pt.MyAppName=Servidor SQL Firebird %1
 pt.ServerInstall=Instalação completa do Server e ferramentas de desenvolvimento.
 pt.SuperServerInstall=Instalação completa do Super Server e ferramentas de desenvolvimento.
 pt.ClassicServerInstall=Instalação completa do Classic Server e ferramentas de desenvolvimento.
@@ -51,9 +51,11 @@
 pt.PreviousInstallBroken=   (A Instalação aparenta estar danificada por disparidade no texto da versão.)
 pt.PreviousInstallGood=   (A Instalação aparenta estar correcta.)
 
-pt.IconReadme=Firebird 2.0 Leia-me
+pt.IconReadme=Firebird 2.1 Leia-me
 pt.IconUninstall=Remoção do Firebird
 pt.ReleaseNotes= Notas de Lançamento. (Requer Acrobat Reader.)
+pt.InstallationGuide= installation guide. (Requer Acrobat Reader.)
+pt.BugFixes= bug fixes. (Requer Acrobat Reader.)
 pt.Uninstall=Remoção do Firebird
 pt.Winsock2Web1=A biblioteca Winsock 2 não está instalada.
 pt.Winsock2Web2=Pretende visitar a página de actualização na Internet do Winsock 2?

Build Version :  T2.5.0.18026 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18185 2008/01/22 08:05:57 paul_reeves )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/ba
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10822/ba

Modified Files:
      Tag: B2_1_Release
	custom_messages_ba.inc 
Log Message:
minor changes required to bring the windows installer up to date for 2.1

Index: custom_messages_ba.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/ba/custom_messages_ba.inc,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -b -U3 -r1.3 -r1.3.8.1
--- custom_messages_ba.inc	6 Dec 2006 05:51:45 -0000	1.3
+++ custom_messages_ba.inc	22 Jan 2008 08:05:55 -0000	1.3.8.1
@@ -1,4 +1,4 @@
-ba.MyAppName=Firebird Database Server 2.0
+ba.MyAppName=Firebird Database Server %1
 ba.ServerInstall=Puna instalacija Server-a i razvojnih alata.
 ba.SuperServerInstall=Puna instalacija Super Server-a i razvojnih alata.
 ba.ClassicServerInstall=Puna instalacijaClassic Server-a i razvojnih alata.
@@ -51,9 +51,12 @@
 ba.PreviousInstallBroken=   (Instalacija je neuspješna zbog razlike u verzijama.)
 ba.PreviousInstallGood=   (Instalacija je uspješna.)
 
-ba.IconReadme=Firebird 2.0 Readme
+ba.IconReadme=Firebird 2.1 Readme
 ba.IconUninstall=Deinstalacija Firebird-a
 ba.ReleaseNotes= release notes. (Potreban je Acrobat Reader.)
+ba.InstallationGuide= installation guide. (Potreban je Acrobat Reader.)
+ba.BugFixes= bug fixes. (Potreban je Acrobat Reader.)
+
 ba.Uninstall=Deinstalacija Firebird-a
 ba.Winsock2Web1=Winsock 2 nije instaliran.
 ba.Winsock2Web2=Želite li da posjetite Winsock 2 Update Home Page?

Build Version :  T2.5.0.18029 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18188 2008/01/22 08:06:22 paul_reeves )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/pl
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10822/pl

Modified Files:
      Tag: B2_1_Release
	custom_messages_pl.inc 
Log Message:
minor changes required to bring the windows installer up to date for 2.1

Index: custom_messages_pl.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/pl/custom_messages_pl.inc,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -b -U3 -r1.3 -r1.3.4.1
--- custom_messages_pl.inc	10 Oct 2007 10:57:19 -0000	1.3
+++ custom_messages_pl.inc	22 Jan 2008 08:06:22 -0000	1.3.4.1
@@ -1,4 +1,4 @@
-pl.MyAppName=Serwer bazy danych Firebird 2.0
+pl.MyAppName=Serwer bazy danych Firebird %1
 pl.ServerInstall=Pe³na instalacja (Server) i narzêdzi programistycznych.
 pl.SuperServerInstall=Pe³na instalacja (Super Server) i narzêdzi programistycznych.
 pl.ClassicServerInstall=Pe³na instalacja (Classic Server) i narzêdzi programistycznych.
@@ -54,6 +54,8 @@
 pl.IconReadme=Firebird 2.0 - przeczytaj mnie
 pl.IconUninstall=Deinstalacja Firebird'a
 pl.ReleaseNotes= Informacje o wydaniu. (Wymagany Acrobat Reader.)
+pl.InstallationGuide= installation guide. (Wymagany Acrobat Reader.)
+pl.BugFixes= bug fixes. (Wymagany Acrobat Reader.)
 pl.Uninstall=Deinstalacja Firebird'a
 pl.Winsock2Web1=Winsock 2 nie jest zainstalowany.
 pl.Winsock2Web2=Czy chcesz odwiedziæ stronê z aktualizacjami Winsock 2 ?

Build Version :  T2.5.0.18025 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18185 2008/01/22 08:05:57 paul_reeves )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10822

Modified Files:
      Tag: B2_1_Release
	BuildExecutableInstall.bat FirebirdInstall_20.iss Readme.txt 
	custom_messages.inc installation_readme.txt 
Log Message:
minor changes required to bring the windows installer up to date for 2.1

Index: BuildExecutableInstall.bat
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/BuildExecutableInstall.bat,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -b -U3 -r1.33 -r1.33.2.1
--- BuildExecutableInstall.bat	21 Dec 2007 12:10:14 -0000	1.33
+++ BuildExecutableInstall.bat	22 Jan 2008 08:05:51 -0000	1.33.2.1
@@ -311,7 +311,7 @@
 @if %ERRORLEVEL% GEQ 1 ( (call :ERROR Copying doc\sql.extensions failed  ) & (goto :EOF))
 
 @echo   Copying pdf docs...
-@... %%v in ( Firebird-2.0-QuickStart.pdf Firebird_v1.5.4.ReleaseNotes.pdf Firebird_v2.0.3.ReleaseNotes.pdf Firebird_v2.1.0.ReleaseNotes.pdf ) do (
+@for %%v in ( Firebird-2.0-QuickStart.pdf Firebird_v1.5.4.ReleaseNotes.pdf Firebird_v2.0.3.ReleaseNotes.pdf Firebird_v2.1.0.ReleaseNotes.pdf Firebird_v2.1.0.InstallationGuide.pdf Firebird_v2.1.0.BugFixes.pdf) do (
   @echo     ... %%v
   (@copy /Y %FB_EXTERNAL_DOCS%\%%v %FB_OUTPUT_DIR%\doc\%%v > nul) || (call :WARNING Copying %FB_EXTERNAL_DOCS%\%%v failed.)
 )

Index: FirebirdInstall_20.iss
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/FirebirdInstall_20.iss,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -b -U3 -r1.29 -r1.29.2.1
--- FirebirdInstall_20.iss	22 Dec 2007 00:53:34 -0000	1.29
+++ FirebirdInstall_20.iss	22 Jan 2008 08:05:51 -0000	1.29.2.1
@@ -168,13 +168,18 @@
 #define AppVer MajorVer + "_" + MinorVer
 #define GroupnameVer MajorVer + "." + MinorVer
 
-
-;If we are building the pdb package then
-;we don't include files or examples.
-#ifdef ship_pdb
-#undef files
-#undef examples
-#endif
+; We can save space by shipping a pdb package that just includes
+; the pdb files. It would then upgrade an existing installation,
+; however, it wouldn't work on its own. This practice would go
+; against previous policy, which was to make the pdb package a
+; complete package. OTOH, now we have 32-bit and 64-bit platforms
+; to support we would benefit from slimming down the pdb packages.
+;;Uncomment the following lines to build the pdb package
+;;with just the pdb files.
+;#ifdef ship_pdb
+;#undef files
+;#undef examples
+;#endif
 
 
 ;Some more strings to distinguish the name of final executable
@@ -379,8 +384,10 @@
 Name: {group}\Firebird Guardian; Filename: {app}\bin\fbguard.exe; Parameters: -a; Flags: runminimized; MinVersion: 4.0,4.0;  Check: InstallGuardianIcon; IconIndex: 1; Components: ServerComponent\SuperServerComponent; Comment: Run Firebird Super Server (with guardian)
 Name: {group}\Firebird ISQL Tool; Filename: {app}\bin\isql.exe; WorkingDir: {app}; MinVersion: 4.0,4.0;  Comment: {cm:RunISQL}
 Name: {group}\Firebird 2.1.0 Release Notes; Filename: {app}\doc\Firebird_v2.1.0.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
+Name: {group}\Firebird 2.1.0 Installation Guide; Filename: {app}\doc\Firebird_v2.1.0.InstallationGuide.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:InstallationGuide}
+Name: {group}\Firebird 2.1.0 Bug Fixes; Filename: {app}\doc\Firebird_v2.1.0.BugFixes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:BugFixes}
 Name: {group}\Firebird 2.0.3 Release Notes; Filename: {app}\doc\Firebird_v2.0.1.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
-Name: {group}\Firebird 1.5.4 Release Notes; Filename: {app}\doc\Firebird_v1.5.4.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
+Name: {group}\Firebird 1.5.5 Release Notes; Filename: {app}\doc\Firebird_v1.5.5.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
 Name: {group}\Firebird 2.0 Quick Start Guide; Filename: {app}\doc\Firebird-2.0-QuickStart.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName}
 Name: "{group}\After Installation"; Filename: "{app}\doc\After_Installation.url"; Comment: "New User? Here's a quick guide to what you should do next."
 Name: "{group}\Firebird Web-site"; Filename: "{app}\doc\firebirdsql.org.url"

Index: Readme.txt
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/Readme.txt,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -b -U3 -r1.15 -r1.15.4.1
--- Readme.txt	15 Oct 2007 05:53:31 -0000	1.15
+++ Readme.txt	22 Jan 2008 08:05:51 -0000	1.15.4.1
@@ -3,10 +3,10 @@
 Firebird 2.1.0       (Windows Build)
 ====================================
 
-  *** Beta 2 ***
 
 o Introduction
 o Intended Users
+o Known Issues
 o Features in this release (all platforms)
 o Bugs fixed in this release
 o Installation
@@ -16,16 +16,28 @@
 Introduction
 ============
 
-Welcome to the second beta release of Firebird 2.1
+Welcome to Firebird 2.1.
 
 
 Intended Users
 ==============
 
-This beta release is intended for experienced Firebird
-users. It has not been thoroughly tested and new
-features are only sparsely documented. Do not use this
-release in a production environment.
+This release candidate is intended for experienced
+Firebird users. It has been reasonably well tested and
+all new features should now be properly documented.
+
+Do not use this release in a production environment.
+
+
+Known Issues
+============
+
+Windows Vista - The binary installer fails to start
+Firebird as a service at installation time, however,
+the service does start correctly after a reboot. As a
+workaround, you can shift-right click on the Firebird
+control panel applet, choose 'Run as...' and start the
+service from there.
 
 
 Features in this release
@@ -34,18 +46,15 @@
 Please see the Release Notes for details of new
 features.
 
+
 Installation
 ============
 
-Binary installation packages are available, but they do
-not support multiple service instance installation.
-Be sure to read the installation_readme.txt in the doc
-directory for more information concerning installation
-issues.
-
-You can also use the zip packages to install Firebird
-manually. There is more info on manual installation
-in doc\install_windows_manually.txt.
+Installation issues are covered in detail in the
+Installation Guide available in the doc directory after
+install. A brief summary of installation issues can
+also be found in the installation_readme.txt, also
+available from the doc directory after installation.
 
 
 Reporting Bugs

Index: custom_messages.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/custom_messages.inc,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -b -U3 -r1.5 -r1.5.6.1
--- custom_messages.inc	25 Jul 2007 14:43:42 -0000	1.5
+++ custom_messages.inc	22 Jan 2008 08:05:51 -0000	1.5.6.1
@@ -54,6 +54,8 @@
 en.IconReadme=Firebird %1 Readme
 en.IconUninstall=Uninstall Firebird %1
 en.ReleaseNotes= release notes. (Requires Acrobat Reader.)
+en.InstallationGuide= installation guide. (Requires Acrobat Reader.)
+en.BugFixes= bug fixes. (Requires Acrobat Reader.)
 en.Uninstall=Uninstall Firebird %1
 en.Winsock2Web1=Winsock 2 is not installed.
 en.Winsock2Web2=Would you like to Visit the Winsock 2 Update Home Page?

Index: installation_readme.txt
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/installation_readme.txt,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -b -U3 -r1.15 -r1.15.2.1
--- installation_readme.txt	21 Dec 2007 12:10:16 -0000	1.15
+++ installation_readme.txt	22 Jan 2008 08:05:51 -0000	1.15.2.1
@@ -9,10 +9,10 @@
 primarily aimed at users of the binary installer.
 
 It is assumed that readers of this document are already
-familiar Firebird 2.0. If you are evaluating Fb 2.1 as
-part of a migration from Fb 1.5 you are advised to
-review the Fb 2.0 documentation to understand the
-changes made between 1.5 and 2.0.
+familiar with Firebird 2.0. If you are evaluating
+Firebird 2.1 as part of a migration from Fb 1.5 you are
+advised to review the Fb 2.0 documentation to
+understand the changes made between 1.5 and 2.0.
 
 
 Contents
@@ -61,9 +61,9 @@
   should manually install them with the zipped install
   image.
 
-o Unfortunately, (at the time of Beta 2) the installer
-  cannot detect if a previous version of Firebird
-  Classic server are running.
+o Unfortunately, the installer cannot reliably detect
+  if a previous version of Firebird Classic server
+  is running.
 
 o There are known areas of overlap between the
   32-bit and 64-bit installs:

Build Version :  T2.5.0.18028 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18188 2008/01/22 08:06:22 paul_reeves )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/it
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10822/it

Modified Files:
      Tag: B2_1_Release
	custom_messages_it.inc 
Log Message:
minor changes required to bring the windows installer up to date for 2.1

Index: custom_messages_it.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/it/custom_messages_it.inc,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -b -U3 -r1.2 -r1.2.8.1
--- custom_messages_it.inc	6 Dec 2006 05:52:16 -0000	1.2
+++ custom_messages_it.inc	22 Jan 2008 08:06:18 -0000	1.2.8.1
@@ -1,4 +1,4 @@
-it.MyAppName=Firebird Database Server 2.0
+it.MyAppName=Firebird Database Server %1
 it.ServerInstall=Installazione completa di Server e strumenti di sviluppo.
 it.SuperServerInstall=Installazione completa di Super Server e strumenti di sviluppo.
 it.ClassicServerInstall=Installazione completa di Classic Server e strumenti di sviluppo.
@@ -51,9 +51,11 @@
 it.PreviousInstallBroken=   (Installazione apparentemente danneggiata - mancata corrispondenza dei numeri di versione.)
 it.PreviousInstallGood=   (Installazione corretta.)
 
-it.IconReadme=Firebird 2.0 Leggimi
+it.IconReadme=Firebird 2.1 Leggimi
 it.IconUninstall=Disinstallazione di Firebird
 it.ReleaseNotes= note sul rilascio. (Richiede Acrobat Reader.)
+it.InstallationGuide= installation guide. (Richiede Acrobat Reader.)
+it.BugFixes= bug fixes. (Richiede Acrobat Reader.)
 it.Uninstall=Disinstallazione di Firebird
 it.Winsock2Web1=Winsock 2 non risulta installato.
 it.Winsock2Web2=Si prega di visitare il sito di aggiornamento relativo a Winsock 2

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/hu
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10822/hu

Modified Files:
      Tag: B2_1_Release
	custom_messages_hu.inc 
Log Message:
minor changes required to bring the windows installer up to date for 2.1

Index: custom_messages_hu.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/hu/custom_messages_hu.inc,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -b -U3 -r1.3 -r1.3.8.1
--- custom_messages_hu.inc	6 Dec 2006 05:52:10 -0000	1.3
+++ custom_messages_hu.inc	22 Jan 2008 08:06:15 -0000	1.3.8.1
@@ -1,4 +1,4 @@
-hu.MyAppName=Firebird Adatbázisszerver 2.0.
+hu.MyAppName=Firebird Adatbázisszerver %1.
 hu.ServerInstall=Szerver és a fejlesztõi eszközök teljes telepítése
 hu.SuperServerInstall=Szuper Szerver és a fejlesztõi eszközök teljes telepítése
 hu.ClassicServerInstall=Hagyományos Szerver és a fejlesztõi eszközök teljes telepítése
@@ -51,9 +51,11 @@
 hu.PreviousInstallBroken=   (A telepítés hibásnak tûnik a nem megfelelõ verzió-azonosító miatt.)
 hu.PreviousInstallGood=   (A telepítés hibátlannak tûnik.)
 
-hu.IconReadme=Firebird 2.0 - Olvass El
+hu.IconReadme=Firebird 2.1 - Olvass El
 hu.IconUninstall=A Firebird eltávolítása
-hu.ReleaseNotes=Firebird 2.0 - Újdonságok (Acrobat Reader programot igényel)
+hu.ReleaseNotes=Firebird 2.1 - Újdonságok (Acrobat Reader programot igényel)
+hu.InstallationGuide= installation guide. (Acrobat Reader programot igényel)
+hu.BugFixes= bug fixes. (Acrobat Reader programot igényel)
 hu.Uninstall=A Firebird eltávolítása
 hu.Winsock2Web1=A Winsock 2 kiterjesztés nincs telepítve.
 hu.Winsock2Web2=Meg kívánja látogatni a Winsock 2 frissítés honlapját?

Build Version :  T2.5.0.18027 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18187 2008/01/22 08:06:08 paul_reeves )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/fr
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10822/fr

Modified Files:
      Tag: B2_1_Release
	custom_messages_fr.inc 
Log Message:
minor changes required to bring the windows installer up to date for 2.1

Index: custom_messages_fr.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/fr/custom_messages_fr.inc,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -b -U3 -r1.3 -r1.3.8.1
--- custom_messages_fr.inc	6 Dec 2006 05:52:06 -0000	1.3
+++ custom_messages_fr.inc	22 Jan 2008 08:06:13 -0000	1.3.8.1
@@ -1,4 +1,4 @@
-fr.MyAppName=Firebird Serveur SQL 2.0
+fr.MyAppName=Firebird Serveur SQL %1
 fr.ServerInstall=Installation complète Serveur et outils de dévelopement.
 fr.SuperServerInstall=Installation complète Super Serveur et outils de dévelopement.
 fr.ClassicServerInstall=Installation complète Serveur Classique et outils de dévelopement.
@@ -52,9 +52,11 @@
 fr.PreviousInstallBroken=   (L'installation semble être cassée à cause d'une disparité de la chaîne de version.)
 fr.PreviousInstallGood=   (L'installation semble être bonne.)
 
-fr.IconReadme=Firebird 2.0 Lisez Moi
+fr.IconReadme=Firebird 2.1 Lisez Moi
 fr.IconUninstall=Désinstaller Firebird
 fr.ReleaseNotes= notes de version. (Nécessite Acrobat Reader.)
+fr.InstallationGuide= installation guide. (Nécessite Acrobat Reader.)
+fr.BugFixes= bug fixes. (Nécessite Acrobat Reader.)
 fr.Uninstall=Désinstaller Firebird
 fr.Winsock2Web1=Winsock 2 n'est pas installé.
 fr.Winsock2Web2=Voulez-vous visiter la page web de mise à jour de Winsock 2 ?

Build Version :  T2.5.0.18027 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18187 2008/01/22 08:06:08 paul_reeves )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/es
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10822/es

Modified Files:
      Tag: B2_1_Release
	custom_messages_es.inc 
Log Message:
minor changes required to bring the windows installer up to date for 2.1

Index: custom_messages_es.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/es/custom_messages_es.inc,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -b -U3 -r1.2 -r1.2.8.1
--- custom_messages_es.inc	6 Dec 2006 05:52:00 -0000	1.2
+++ custom_messages_es.inc	22 Jan 2008 08:06:02 -0000	1.2.8.1
@@ -1,4 +1,4 @@
-es.MyAppName=Firebird Database Server 2.0
+es.MyAppName=Firebird Database Server %1
 es.ServerInstall=Instalación completa de Server y herramientas de desarrollo.
 es.SuperServerInstall=Instalación completa de Super Server y herramientas de desarrollo.
 es.ClassicServerInstall=Instalación completa de Classic Server y herramientas de desarrollo.
@@ -50,9 +50,11 @@
 es.PreviousInstallBroken=   (La instalación parece incorrecta debido a diferencias entre las cadenas de versión.)
 es.PreviousInstallGood=   (La instalación parece estar correcta.)
 
-es.IconReadme=Leame Firebird 2.0
+es.IconReadme=Leame Firebird 2.1
 es.IconUninstall=Desinstalar Firebird
 es.ReleaseNotes= notas de la versión. (Requiere Acrobat Reader.)
+es.InstallationGuide= installation guide. (Requiere Acrobat Reader.)
+es.BugFixes= bug fixes. (Requiere Acrobat Reader.)
 es.Uninstall=Desinstalar Firebird
 es.Winsock2Web1=Winsock 2 no está instalado.
 es.Winsock2Web2=¿Desea visitar la página web de actualización de Winsock 2?

Build Version :  T2.5.0.18028 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18188 2008/01/22 08:06:22 paul_reeves )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/si
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10822/si

Modified Files:
      Tag: B2_1_Release
	custom_messages_si.inc 
Log Message:
minor changes required to bring the windows installer up to date for 2.1

Index: custom_messages_si.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/si/custom_messages_si.inc,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -b -U3 -r1.3 -r1.3.8.1
--- custom_messages_si.inc	6 Dec 2006 05:52:31 -0000	1.3
+++ custom_messages_si.inc	22 Jan 2008 08:06:29 -0000	1.3.8.1
@@ -1,4 +1,4 @@
-si.MyAppName=Firebird Database Server 2.0
+si.MyAppName=Firebird Database Server %1
 si.ServerInstall=Polna instalacija serverja in razvojnih orodij.
 si.SuperServerInstall=Polna instalacija super serverja in razvojnih orodij.
 si.ClassicServerInstall=Polna instalacija klasiènega serverja in razvojnih orodij.
@@ -44,16 +44,18 @@
 si.InstalledProdCountSingular=verzija ima
 si.InstalledProdCountPlural=verzije imajo
 
-si.FbRunning1=Obstojeèa verzija Firebird 2.0 Server je zagnana.
+si.FbRunning1=Obstojeèa verzija Firebird 2.1 Server je zagnana.
 si.FbRunning2=Zaprite vse aplikacije oz. jih zakljuèite v
 si.FbRunning3=nastavitah servisov.
 
 si.PreviousInstallBroken=   (Instalacije je bila prekinjena zaradi neujemanja informacije o verzijah.)
 si.PreviousInstallGood=   (Instalacije je uspela.)
 
-si.IconReadme=Firebird 2.0 Readme
+si.IconReadme=Firebird 2.1 Readme
 si.IconUninstall=Deinstalacija Firebird serverja
 si.ReleaseNotes= informacija o izdaji. (Potreben je programAcrobat Reader.)
+si.InstallationGuide= installation guide. (Potreben je programAcrobat Reader.)
+si.BugFixes= bug fixes. (Potreben je programAcrobat Reader.)
 si.Uninstall=Deinstalacija Firebird
 si.Winsock2Web1=Winsock 2 komponente niso instalirane.
 si.Winsock2Web2=Ali želite obiskati domaèo stran za Winsock 2 posodobitev?

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/de
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10822/de

Modified Files:
      Tag: B2_1_Release
	custom_messages_de.inc 
Log Message:
minor changes required to bring the windows installer up to date for 2.1

Index: custom_messages_de.inc
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/win32/de/custom_messages_de.inc,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -b -U3 -r1.3 -r1.3.8.1
--- custom_messages_de.inc	6 Dec 2006 05:51:55 -0000	1.3
+++ custom_messages_de.inc	22 Jan 2008 08:05:58 -0000	1.3.8.1
@@ -1,4 +1,4 @@
-de.MyAppName=Firebird Datenbank Server 2.0
+de.MyAppName=Firebird Datenbank Server %1
 de.ServerInstall=Vollständige Installation des Server inkl. Entwicklungstools.
 de.SuperServerInstall=Vollständige Installation des Super Server inkl. Entwicklungstools.
 de.ClassicServerInstall=Vollständige Installation des Classic Server inkl. Entwicklungstools.
@@ -51,9 +51,11 @@
 de.PreviousInstallBroken=   (Die Installation scheint wegen eines Versionskonflikts fehlerhaft zu sein.)
 de.PreviousInstallGood=   (Die Installation scheint korrekt sein.)
 
-de.IconReadme=Firebird 2.0 Liesmich
+de.IconReadme=Firebird 2.1 Liesmich
 de.IconUninstall=Firebird Deinstallation
 de.ReleaseNotes= Release Hinweise. (Benötigt Acrobat Reader.)
+de.InstallationGuide= installation guide. (Benötigt Acrobat Reader.)
+de.BugFixes= bug fixes. (Benötigt Acrobat Reader.)
 de.Uninstall=Firebird deinstallieren
 de.Winsock2Web1=Winsock 2 ist nicht installiert.
 de.Winsock2Web2=Möchten Sie die Winsock 2 Update Home Page besuchen?

Build Version :  T2.5.0.18023 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18183 2008/01/22 03:22:54 fsg Exp $ )

Update of /cvsroot/firebird/firebird2
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29570/firebird2

Modified Files:
	ChangeLog 
Log Message:
nightly update


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/firebird2/ChangeLog,v
retrieving revision 1.1529
retrieving revision 1.1530
diff -b -U3 -r1.1529 -r1.1530
--- ChangeLog	21 Jan 2008 03:23:14 -0000	1.1529
+++ ChangeLog	22 Jan 2008 03:22:48 -0000	1.1530
@@ -1,3 +1,16 @@
+2008-01-22 03:49  asfernandes
+
+	* firebird2/src/jrd/fun.epp (1.84):
+
+	Fixed a problem (not reproducable in stable releases) that causes
+	assertion when rdb$*_context functions throws exceptions.
+
+2008-01-21 11:14  alexpeshkoff
+
+	* firebird2/configure.in (1.278):
+
+	Restored build flags
+
 2008-01-21 00:51  asfernandes
 
 	* firebird2/src/: jrd/license.h (1.38), jrd/pag.cpp (1.161),

Build Version :  T2.5.0.18022 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.18182 2008/01/22 02:49:23 asfernandes )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15903/src/jrd

Modified Files:
	fun.epp 
Log Message:
Fixed a problem (not reproducable in stable releases) that causes assertion when rdb$*_context functions throws exceptions.


Index: fun.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/fun.epp,v
retrieving revision 1.83
retrieving revision 1.84
diff -b -U3 -r1.83 -r1.84
--- fun.epp	16 Jan 2008 09:07:23 -0000	1.83
+++ fun.epp	22 Jan 2008 02:49:17 -0000	1.84
@@ -1007,8 +1007,17 @@
 	else
 	{
 		THREAD_EXIT();
+		UCHAR* temp_ptr;
+		try
+		{
 		typedef UCHAR* pUCHAR;
-		UCHAR* temp_ptr = CALL_UDF(function->fun_entrypoint, pUCHAR);
+			temp_ptr = CALL_UDF(function->fun_entrypoint, pUCHAR);
+		}
+		catch (...)
+		{
+			THREAD_ENTER();
+			throw;
+		}
 		THREAD_ENTER();
 		
 		if (temp_ptr != NULL)