From 2e13cf90c01b794e27baadb6c61f6306aae73d38 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 16 Oct 2007 10:10:36 +0000 Subject: [PATCH] Version 1.3.50. --- NEWS | 2 ++ configure.in | 6 +++--- debian/changelog | 6 ++++++ include/zebraver.h | 8 ++++---- win/makefile | 8 ++++---- win/zebra.nsi | 6 +++--- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/NEWS b/NEWS index 5222dc8..f10a5e1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +--- 1.3.50 2007/10/16 + Fixed buffer overrun in leaf page merge code in ISAMB system. Update code to use new YAZ log functions/defines. diff --git a/configure.in b/configure.in index 8a5681f..87559f1 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ -dnl Zebra, Index Data Aps, 1995-2006 -dnl $Id: configure.in,v 1.91.2.35 2007-10-11 06:48:18 adam Exp $ +dnl Zebra, Index Data Aps, 1995-2007 +dnl $Id: configure.in,v 1.91.2.36 2007-10-16 10:10:37 adam Exp $ dnl AC_INIT(include/zebraver.h) -AM_INIT_AUTOMAKE(idzebra,1.3.49) +AM_INIT_AUTOMAKE(idzebra,1.3.50) PACKAGE_SUFFIX="-1.3" AC_SUBST(PACKAGE_SUFFIX) dnl ------ Substitutions diff --git a/debian/changelog b/debian/changelog index 24ee188..c6624d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +idzebra (1.3.50-1) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Tue, 16 Oct 2007 12:05:36 +0200 + idzebra (1.3.48-1) unstable; urgency=low * Upstream. diff --git a/include/zebraver.h b/include/zebraver.h index d234a6d..91b20a8 100644 --- a/include/zebraver.h +++ b/include/zebraver.h @@ -1,5 +1,5 @@ -/* $Id: zebraver.h,v 1.38.2.23 2007-10-11 06:48:18 adam Exp $ - Copyright (C) 1995-2006 +/* $Id: zebraver.h,v 1.38.2.24 2007-10-16 10:10:37 adam Exp $ + Copyright (C) 1995-2007 Index Data Aps This file is part of the Zebra server. @@ -21,9 +21,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef ZEBRAVER -#define ZEBRAVER "1.3.49" +#define ZEBRAVER "1.3.50" #endif #ifndef ZEBRADATE -#define ZEBRADATE "$Date: 2007-10-11 06:48:18 $" +#define ZEBRADATE "$Date: 2007-10-16 10:10:37 $" #endif diff --git a/win/makefile b/win/makefile index a76d59e..081fe99 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Zebra makefile for MS NMAKE -# $Id: makefile,v 1.25.2.8 2006-08-14 18:01:40 adam Exp $ +# $Id: makefile,v 1.25.2.9 2007-10-16 10:10:37 adam Exp $ ########################################################### ############### Parameters @@ -9,7 +9,7 @@ DEBUG=0 # 0 for release, 1 for debug # EXPAT is optional. It's required for grs.xml-filters. HAVE_EXPAT=1 -EXPAT_DIR=c:\Expat-1.95.8 +EXPAT_DIR=c:\Program files\Expat 2.0.1 # iconv is optional HAVE_ICONV=1 @@ -122,8 +122,8 @@ dll: $(DLL) !if $(HAVE_EXPAT) EXPAT_DEF= /D HAVE_EXPAT_H=1 /I"$(EXPAT_DIR)\source\lib" -EXPAT_LIB= "$(EXPAT_DIR)\libs\libexpat.lib" -EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\libs\libexpat.dll" +EXPAT_LIB= "$(EXPAT_DIR)\bin\libexpat.lib" +EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\bin\libexpat.dll" EXPAT_DLL_TARGET="$(BINDIR)\libexpat.dll" expat: $(EXPAT_DLL_TARGET) diff --git a/win/zebra.nsi b/win/zebra.nsi index 369f10f..ff2b4b5 100644 --- a/win/zebra.nsi +++ b/win/zebra.nsi @@ -1,6 +1,6 @@ -; $Id: zebra.nsi,v 1.20.2.25 2006-12-22 18:43:33 adam Exp $ +; $Id: zebra.nsi,v 1.20.2.26 2007-10-16 10:10:37 adam Exp $ -!define VERSION "1.3.48" +!define VERSION "1.3.50" !define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin" !include "MUI.nsh" @@ -77,7 +77,7 @@ Section "Zebra Runtime" File ..\bin\yaz.dll File ..\bin\libexpat.dll File ..\bin\idzebra.dll - File "${VS_RUNTIME_LOCATION}\msvcr71.dll" +; File "${VS_RUNTIME_LOCATION}\msvcr71.dll" SectionEnd Section "Zebra Development" -- 1.7.10.4