From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 26 Apr 2005 18:46:42 +0000 (+0000)
Subject: Towards 2.1.4.
X-Git-Tag: YAZ.2.1.4
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=a088ea8c24e28419057ddae8c23936272b578b7c;p=yaz-moved-to-github.git

Towards 2.1.4.
---

diff --git a/NEWS b/NEWS
index 3b4eb66..1c203bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,17 +1,24 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+--- 2.1.4 2005/04/26 
+
 Changed include/yaz/diagbib1.h and added include/yaz/diagsrw.h with
 diagnostic messages+codes for Bib-1 and SRW. Preprocessor defines are
 now defined for all those error codes. So instead of putting 109 in
-your program you'd use YAZ_BIB1_DATABASE_UNAVAILABLE. The
-messages are now generated from a .csv - file. See src/bib1.csv and
-srw/srw.csv.
+your program you'd use YAZ_BIB1_DATABASE_UNAVAILABLE. The messages
+are generated from a .csv - file. See src/bib1.csv and srw/srw.csv.
 
 Modified the yaz-marcdump utility to skip garbage bytes between MARC
 records in a file.
 
-Fixed bug - uinitialized memory - introduced by code introduced by
-the fix of bug #272.
+Fixed bug - uninitialized memory - due to bad code for fix of bug #272.
+
+Program yaz-client now exits and produces an error message if multiple
+Z39.50 servers are specified on the command line (none or one allowed
+only).
+
+Program yaz-marcdump skips garbage bytes between ISO2709 records rather
+than abort.
 
 --- 2.1.2 2005/03/16 
 
diff --git a/configure.in b/configure.in
index 7c769b6..b5d28f6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2005
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.175 2005-04-20 13:51:47 adam Exp $
+dnl $Id: configure.in,v 1.176 2005-04-26 18:46:42 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.1.3)
+AM_INIT_AUTOMAKE(yaz, 2.1.4)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
diff --git a/debian/changelog b/debian/changelog
index 94f4ebd..181c796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (2.1.4-1) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 26 Apr 2005 20:39:54 +0200
+
 yaz (2.1.2-1) unstable; urgency=low
 
   * Upstream.
diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index 6bd0b09..3290445 100644
--- a/include/yaz/yaz-version.h
+++ b/include/yaz/yaz-version.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: yaz-version.h,v 1.65 2005-04-20 13:51:47 adam Exp $
+ * $Id: yaz-version.h,v 1.66 2005-04-26 18:46:42 adam Exp $
  */
 
 /**
@@ -13,8 +13,8 @@
 
 #include <yaz/yconfig.h>
 
-#define YAZ_VERSION "2.1.3"
-#define YAZ_VERSIONL 0x020103
+#define YAZ_VERSION "2.1.4"
+#define YAZ_VERSIONL 0x020104
 
 #define YAZ_DATE 1
 
diff --git a/win/yaz.nsi b/win/yaz.nsi
index f85f3ac..7a2b190 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.66 2005-04-22 14:51:11 adam Exp $
+; $Id: yaz.nsi,v 1.67 2005-04-26 18:46:42 adam Exp $
 
-!define VERSION "2.1.3"
+!define VERSION "2.1.4"
 
 !include "MUI.nsh"
 
diff --git a/win/yaz.rc b/win/yaz.rc
index 9067ac9..814a5a9 100644
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,2,1
- PRODUCTVERSION 2,1,2,1
+ FILEVERSION 2,1,4,1
+ PRODUCTVERSION 2,1,4,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, 1, 2, 1\0"
+            VALUE "FileVersion", "2, 1, 4, 1\0"
             VALUE "InternalName", "YAZ\0"
             VALUE "LegalCopyright", "Copyright © 1995-2005 Index Data\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "yaz.rc\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Index Data YAZ Toolkit\0"
-            VALUE "ProductVersion", "2, 1, 2, 1\0"
+            VALUE "ProductVersion", "2, 1, 4, 1\0"
             VALUE "SpecialBuild", "\0"
         END
     END