Towards 2.0.26

diff --git a/NEWS b/NEWS
index 6a6206e..3ee3d65 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,17 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+--- 2.0.26 2004/10/01
+
+Fixed MARC->MARCXML conversion to properly deal with
+fields, subfields, indicators having non-ASCII characters.
+
+Fixed MARC->MARCXML conversion so that ASCII control characters
+except TAB,CR,LF are removed from resulting XML (XML 1.0 does not
+support these).
+
+Added YAZ GFS support for conversion from Z39.50 surrogate
+diagnostics to SRW surrogate diagnostics.
+
 Bug fix: YAZ GFS did not return schema in explainResponse.
 
 --- 2.0.25 2004/09/30

diff --git a/configure.in b/configure.in
index 6abe7b6..901096b 100644 (file)
--- 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.153 2004-09-30 11:23:25 adam Exp $
+dnl $Id: configure.in,v 1.154 2004-10-01 13:05:09 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.25)
+AM_INIT_AUTOMAKE(yaz, 2.0.26)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)

diff --git a/debian/changelog b/debian/changelog
index 48c9b1c..67e705b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (2.0.26-1) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Fri,  1 Oct 2004 14:31:47 +0200
+
 yaz (2.0.25-1) unstable; urgency=low
 
   * Upstream.

diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index 2b00623..5320fe0 100644 (file)
--- 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.50 2004-09-30 11:23:26 adam Exp $
+ * $Id: yaz-version.h,v 1.51 2004-10-01 13:05:09 adam Exp $
  */
 
 /*
@@ -12,8 +12,8 @@
 
 #include <yaz/yconfig.h>
 
-#define YAZ_VERSION "2.0.25"
-#define YAZ_VERSIONL 0x020019
+#define YAZ_VERSION "2.0.26"
+#define YAZ_VERSIONL 0x02001A
 
 #define YAZ_DATE 1
 

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 7b55e6a..348860d 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.55 2004-09-30 11:23:26 adam Exp $
+; $Id: yaz.nsi,v 1.56 2004-10-01 13:05:10 adam Exp $
 
-!define VERSION "2.0.25"
+!define VERSION "2.0.26"
 
 !include "MUI.nsh"
 

diff --git a/win/yaz.rc b/win/yaz.rc
index 1912e02..c029b6e 100644 (file)
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,25,1
- PRODUCTVERSION 2,0,25,1
+ FILEVERSION 2,0,26,1
+ PRODUCTVERSION 2,0,26,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, 25, 1\0"
+            VALUE "FileVersion", "2, 0, 26, 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, 25, 1\0"
+            VALUE "ProductVersion", "2, 0, 26, 1\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/yaz.spec.in b/yaz.spec.in
index c5eb99c..7a7b404 100644 (file)
--- a/yaz.spec.in
+++ b/yaz.spec.in
@@ -58,10 +58,10 @@ rm -fr ${RPM_BUILD_ROOT}
 /usr/bin/yaz-marcdump
 /usr/bin/yaz-iconv
 /usr/share/man/man1/yaz-client.*
+/usr/share/man/man8/yaz-ztest.*
 /usr/share/man/man1/zoomsh.*
 /usr/share/man/man1/yaz-marcdump.*
 /usr/share/man/man1/yaz-iconv.*
-/usr/share/man/man8/yaz-ztest.*
 
 %files -n lib%{name}
 /usr/lib/*.so.*