From 57d5c3b970b0c95999f6894f3bbf3dc642b9010f Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 8 Aug 2006 08:41:09 +0000 Subject: [PATCH] Towards 2.1.24. --- NEWS | 2 +- configure.ac | 4 ++-- debian/changelog | 6 ++++++ debian/rules | 2 +- include/yaz/yaz-version.h | 6 +++--- win/yaz.nsi | 4 ++-- win/yaz.rc | 8 ++++---- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/NEWS b/NEWS index 96d09a9..31aab60 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ ---- 2.1.24 [in progress] +--- 2.1.24 2006/08/08 Fixed MARC ISO2709 encoding routines to deal with character set conversion. diff --git a/configure.ac b/configure.ac index 23ded0f..ed3fd70 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl YAZ Toolkit, Index Data 1994-2006 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.28 2006-07-06 10:17:51 adam Exp $ +dnl $Id: configure.ac,v 1.29 2006-08-08 08:41:09 adam Exp $ AC_PREREQ(2.59) -AC_INIT([yaz],[2.1.23],[adam@indexdata.dk]) +AC_INIT([yaz],[2.1.24],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([1.8]) diff --git a/debian/changelog b/debian/changelog index e257dfa..e0f2151 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yaz (2.1.24-1) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Tue, 8 Aug 2006 10:32:04 +0200 + yaz (2.1.23-2) unstable; urgency=low * Second attempt to fix bug #612. diff --git a/debian/rules b/debian/rules index 993d615..3236cd0 100755 --- a/debian/rules +++ b/debian/rules @@ -98,7 +98,7 @@ binary-arch: build install dh_fixperms # dh_perl # dh_python - dh_makeshlibs -V 'libyaz (>= 2.1.22)' + dh_makeshlibs -V 'libyaz (>= 2.1.23)' dh_installdeb dh_shlibdeps -l debian/libyaz/usr/lib dh_gencontrol diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h index 20a49d5..be1f122 100644 --- a/include/yaz/yaz-version.h +++ b/include/yaz/yaz-version.h @@ -2,7 +2,7 @@ * Copyright (C) 1995-2006, Index Data ApS * See the file LICENSE for details. * - * $Id: yaz-version.h,v 1.85 2006-06-16 10:19:31 adam Exp $ + * $Id: yaz-version.h,v 1.86 2006-08-08 08:41:11 adam Exp $ */ /** @@ -13,8 +13,8 @@ #include -#define YAZ_VERSION "2.1.23" -#define YAZ_VERSIONL 0x020117 +#define YAZ_VERSION "2.1.24" +#define YAZ_VERSIONL 0x020118 #define YAZ_DATE 1 diff --git a/win/yaz.nsi b/win/yaz.nsi index 82a62f2..5e1b58f 100644 --- a/win/yaz.nsi +++ b/win/yaz.nsi @@ -1,6 +1,6 @@ -; $Id: yaz.nsi,v 1.90 2006-06-15 13:38:07 adam Exp $ +; $Id: yaz.nsi,v 1.91 2006-08-08 08:41:12 adam Exp $ -!define VERSION "2.1.22" +!define VERSION "2.1.24" ; Microsoft runtime CRT ; VS 2003 diff --git a/win/yaz.rc b/win/yaz.rc index c90afaa..d8f38f9 100644 --- a/win/yaz.rc +++ b/win/yaz.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,22,1 - PRODUCTVERSION 2,1,22,1 + FILEVERSION 2,1,24,1 + PRODUCTVERSION 2,1,24,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -20,14 +20,14 @@ VS_VERSION_INFO VERSIONINFO VALUE "Comments", "Z39.50/SRU Library\0" VALUE "CompanyName", "Index Data ApS\0" VALUE "FileDescription", "YAZ Library\0" - VALUE "FileVersion", "2, 1, 22, 1\0" + VALUE "FileVersion", "2, 1, 24, 1\0" VALUE "InternalName", "YAZ\0" VALUE "LegalCopyright", "Copyright © 1995-2006 Index Data ApS\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "yaz.rc\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "YAZ Toolkit\0" - VALUE "ProductVersion", "2, 1, 22, 1\0" + VALUE "ProductVersion", "2, 1, 24, 1\0" VALUE "SpecialBuild", "\0" END } -- 1.7.10.4