From bce52f3b3f5fbfc29be0dd841d6ced3bba6d16b4 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 15 Jun 2006 13:38:05 +0000 Subject: [PATCH] Towards 2.1.22 --- NEWS | 2 ++ configure.ac | 4 ++-- debian/changelog | 6 ++++++ include/yaz/yaz-version.h | 6 +++--- win/yaz.nsi | 14 +++++++------- win/yaz.rc | 8 ++++---- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index 113c567..2187720 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +--- 2.1.22 2006/06/15 + Changed SRU update structure bend_update_rr so that SRU diagnostics are stored in uri, message and details.. Previously diagnostics were stored in errcode, errstring. Patch by Ko van der Sloot. Breaks binary diff --git a/configure.ac b/configure.ac index 1d1c580..ca269ec 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.24 2006-06-13 15:36:09 adam Exp $ +dnl $Id: configure.ac,v 1.25 2006-06-15 13:38:05 adam Exp $ AC_PREREQ(2.59) -AC_INIT([yaz],[2.1.21],[adam@indexdata.dk]) +AC_INIT([yaz],[2.1.22],[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 7d0e33b..bd770c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yaz (2.1.22-1) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Thu, 15 Jun 2006 15:35:17 +0200 + yaz (2.1.20-1) unstable; urgency=low * Upstream. diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h index 9555efa..3d6ccf3 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.83 2006-06-07 10:48:45 adam Exp $ + * $Id: yaz-version.h,v 1.84 2006-06-15 13:38:06 adam Exp $ */ /** @@ -13,8 +13,8 @@ #include -#define YAZ_VERSION "2.1.21" -#define YAZ_VERSIONL 0x020115 +#define YAZ_VERSION "2.1.22" +#define YAZ_VERSIONL 0x020116 #define YAZ_DATE 1 diff --git a/win/yaz.nsi b/win/yaz.nsi index 72f8825..82a62f2 100644 --- a/win/yaz.nsi +++ b/win/yaz.nsi @@ -1,14 +1,14 @@ -; $Id: yaz.nsi,v 1.89 2006-06-07 18:25:32 adam Exp $ +; $Id: yaz.nsi,v 1.90 2006-06-15 13:38:07 adam Exp $ -!define VERSION "2.1.21" +!define VERSION "2.1.22" ; Microsoft runtime CRT ; VS 2003 -; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll" +!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll" ; VS 2005 -!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll" -!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest" +;!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll" +;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest" !include "MUI.nsh" @@ -92,13 +92,13 @@ Section "YAZ Runtime" YAZ_Runtime Noservice: SetOutPath $INSTDIR\bin File "${VS_RUNTIME_DLL}" - File "${VS_RUNTIME_MANIFEST}" +; File "${VS_RUNTIME_MANIFEST}" File ..\bin\iconv.dll File ..\bin\zlib1.dll File ..\bin\libxml2.dll File ..\bin\libxslt.dll File ..\bin\yaz.dll - File ..\bin\*.manifest +; File ..\bin\*.manifest File ..\bin\*.exe SetOutPath $SMPROGRAMS\YAZ CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \ diff --git a/win/yaz.rc b/win/yaz.rc index 66e00b0..c90afaa 100644 --- a/win/yaz.rc +++ b/win/yaz.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,21,1 - PRODUCTVERSION 2,1,21,1 + FILEVERSION 2,1,22,1 + PRODUCTVERSION 2,1,22,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, 21, 1\0" + VALUE "FileVersion", "2, 1, 22, 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, 21, 1\0" + VALUE "ProductVersion", "2, 1, 22, 1\0" VALUE "SpecialBuild", "\0" END } -- 1.7.10.4