From a1e8950b3ac76b9b8a85d9261b07c558ad8a3c9b Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 5 Feb 2004 11:55:56 +0000
Subject: [PATCH] 2.0.10

---
 CHANGELOG                 |    5 +++++
 configure.in              |    4 ++--
 doc/introduction.xml      |    4 ++--
 include/yaz/yaz-version.h |    6 +++---
 win/yaz.nsi               |    4 ++--
 win/yaz.rc                |    8 ++++----
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c609234..644b8b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+--- 2.0.10 2004/02/05 
+
+For yaz.m4, allow second argument for YAZ_INIT to hold minimal version of
+YAZ required.
+
 * SRW/SRU 1.1 updates. Diagnostic code now a URI.
 
 Added option -p <file> to make Generic Frontend Server to write PID file.
diff --git a/configure.in b/configure.in
index f887541..d77a7de 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.123 2004-01-06 13:38:56 adam Exp $
+dnl $Id: configure.in,v 1.124 2004-02-05 11:55:56 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.9)
+AM_INIT_AUTOMAKE(yaz, 2.0.10)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
diff --git a/doc/introduction.xml b/doc/introduction.xml
index 2201591..cf19427 100644
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -1,4 +1,4 @@
-<!-- $Id: introduction.xml,v 1.17 2003-11-19 22:05:15 adam Exp $ -->
+<!-- $Id: introduction.xml,v 1.18 2004-02-05 11:55:56 adam Exp $ -->
  <chapter id="introduction"><title>Introduction</title>
 
   <para>
@@ -18,7 +18,7 @@
     <listitem><para>
       Supports 
       <ulink url="http://www.loc.gov/z3950/agency/zing/srw/">SRW/SRU</ulink>
-      version 1.0 (over HTTP and HTTPS).
+      version 1.1 (over HTTP and HTTPS).
      </para></listitem>
     <listitem><para>
       Includes BER encoders/decoders for the 
diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index 1e6914a..f5c030c 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.34 2004-01-05 09:34:42 adam Exp $
+ * $Id: yaz-version.h,v 1.35 2004-02-05 11:55:56 adam Exp $
  */
 
 /*
@@ -12,8 +12,8 @@
 
 #include <yaz/yconfig.h>
 
-#define YAZ_VERSION "2.0.9"
-#define YAZ_VERSIONL 0x020009
+#define YAZ_VERSION "2.0.10"
+#define YAZ_VERSIONL 0x02000A
 
 #define YAZ_DATE 1
 
diff --git a/win/yaz.nsi b/win/yaz.nsi
index 94e782d..9c7704c 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.32 2004-01-05 09:34:43 adam Exp $
+; $Id: yaz.nsi,v 1.33 2004-02-05 11:55:56 adam Exp $
 
-!define VERSION "2.0.9"
+!define VERSION "2.0.10"
 
 Name "YAZ"
 Caption "Index Data YAZ ${VERSION} Setup"
diff --git a/win/yaz.rc b/win/yaz.rc
index 17517ed..7e0d365 100644
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,9,3
- PRODUCTVERSION 2,0,9,3
+ FILEVERSION 2,0,10,1
+ PRODUCTVERSION 2,0,10,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, 9, 3\0"
+            VALUE "FileVersion", "2, 0, 10, 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, 9, 3\0"
+            VALUE "ProductVersion", "2, 0, 10, 1\0"
             VALUE "SpecialBuild", "\0"
         END
     END
-- 
1.7.10.4