From 75ada5241cd3a0adf2a5623c7a392dd657e2c15b Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 17 Mar 2004 18:47:41 +0000 Subject: [PATCH] Towards 2.0.17 --- CHANGELOG | 4 ++++ configure.in | 4 ++-- debian/changelog | 6 ++++++ include/yaz/yaz-version.h | 6 +++--- win/makefile | 4 ++-- win/yaz.nsi | 4 ++-- win/yaz.rc | 8 ++++---- 7 files changed, 23 insertions(+), 13 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 114e5f5..e546a1a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ Possible compatibility problems with earlier versions marked with '*'. +--- 2.0.17 2004/03/16 Debian only + +Fix encoding of xsd:string to use text instead of CDATA. + Fix endless loop in CQL parser with unbalanced ". Use a more compact way to store MARC-8 conversion tables. diff --git a/configure.in b/configure.in index 4c41e3a..c703a2a 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ dnl YAZ Toolkit, Index Data 1994-2004 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.132 2004-03-16 13:29:43 adam Exp $ +dnl $Id: configure.in,v 1.133 2004-03-17 18:47:41 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 2.0.16) +AM_INIT_AUTOMAKE(yaz, 2.0.17) AM_MAINTAINER_MODE dnl AC_SUBST(READLINE_LIBS) diff --git a/debian/changelog b/debian/changelog index f4894e9..7a43f9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yaz (2.0.17-1) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Wed, 17 Mar 2004 19:44:51 +0100 + yaz (2.0.16-1) unstable; urgency=low * Character set conversion fixes, MARC-8. diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h index 0603171..6ef5c3e 100644 --- a/include/yaz/yaz-version.h +++ b/include/yaz/yaz-version.h @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-version.h,v 1.41 2004-03-16 13:29:43 adam Exp $ + * $Id: yaz-version.h,v 1.42 2004-03-17 18:47:41 adam Exp $ */ /* @@ -12,8 +12,8 @@ #include -#define YAZ_VERSION "2.0.16" -#define YAZ_VERSIONL 0x020010 +#define YAZ_VERSION "2.0.17" +#define YAZ_VERSIONL 0x020011 #define YAZ_DATE 1 diff --git a/win/makefile b/win/makefile index 5e4c59a..071fb54 100644 --- a/win/makefile +++ b/win/makefile @@ -1,6 +1,6 @@ # Copyright (C) 1994-2004, Index Data # All rights reserved. -# $Id: makefile,v 1.73 2004-03-16 23:07:04 adam Exp $ +# $Id: makefile,v 1.74 2004-03-17 18:47:42 adam Exp $ # # Programmed by # HL: Heikki Levanto, Index Data @@ -615,7 +615,7 @@ $(ITEM_REQ_FILES): $(SRCDIR)\item-req.asn $(SRCDIR)\marc8.c: $(SRCDIR)\charconv.sgm $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl @cd $(SRCDIR) - $(TCL) charconv.tcl -O 1 -p marc8 -s 50 charconv.sgm codetables.xml -o marc8.c + $(TCL) charconv.tcl -O 1 -p marc8 charconv.sgm codetables.xml -o marc8.c !endif diff --git a/win/yaz.nsi b/win/yaz.nsi index 194d1f4..cb1bc52 100644 --- a/win/yaz.nsi +++ b/win/yaz.nsi @@ -1,6 +1,6 @@ -; $Id: yaz.nsi,v 1.41 2004-03-16 13:29:44 adam Exp $ +; $Id: yaz.nsi,v 1.42 2004-03-17 18:47:42 adam Exp $ -!define VERSION "2.0.16" +!define VERSION "2.0.17" Name "YAZ" Caption "Index Data YAZ ${VERSION} Setup" diff --git a/win/yaz.rc b/win/yaz.rc index dc16578..9d2012f 100644 --- a/win/yaz.rc +++ b/win/yaz.rc @@ -54,8 +54,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,16,1 - PRODUCTVERSION 2,0,16,1 + FILEVERSION 2,0,17,1 + PRODUCTVERSION 2,0,17,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -73,14 +73,14 @@ BEGIN VALUE "Comments", "Z39.50 C Library\0" VALUE "CompanyName", "Index Data\0" VALUE "FileDescription", "YAZ Toolkit\0" - VALUE "FileVersion", "2, 0, 16, 1\0" + VALUE "FileVersion", "2, 0, 17, 1\0" VALUE "InternalName", "YAZ\0" VALUE "LegalCopyright", "Copyright © 1995-2004 Index Data\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "yaz.rc\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Index Data YAZ Toolkit\0" - VALUE "ProductVersion", "2, 0, 16, 1\0" + VALUE "ProductVersion", "2, 0, 17, 1\0" VALUE "SpecialBuild", "\0" END END -- 1.7.10.4