From b3a9a74111d4f1f1e14dac4a245cd01b5fa5a9b5 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 29 Nov 2005 20:26:05 +0000
Subject: [PATCH] Towards 2.1.10

---
 NEWS             |   10 +++++-----
 configure.in     |    4 ++--
 debian/changelog |    6 ++++++
 debian/rules     |    2 +-
 win/yaz.nsi      |    4 ++--
 win/yaz.rc       |    8 ++++----
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index 671e367..7e5f110 100644
--- a/NEWS
+++ b/NEWS
@@ -4,12 +4,12 @@ Added ZiNG Update Support. New codecs are defined in srw.h. Extended the
 GFS to support this as well. Backend handler, bend_srw_update, does the
 update work. Code contributed by Ko van der Sloot.
 
-Allow retrieval of Search Result-1 information in ZOOM by the
-use of options that are attached to a result set. ZOOM documentation
-updated accordingly.
+Allow retrieval of Search Result-1 information in ZOOM by the use of
+options that are attached to a result set. ZOOM documentation updated
+accordingly.
 
-Fixed bug #416: First/second comb characters not handled in the
-MARC-8 to UTF-8 conversion. Patch by Raj Patel.
+Fixed bug #416: First/second comb characters not handled in the MARC-8 to
+UTF-8 conversion. Patch by Raj Patel.
 
 Added option -m to GFS to control formatting of timestamps in log file.
 
diff --git a/configure.in b/configure.in
index c596f72..14db112 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.186 2005-09-16 21:44:23 adam Exp $
+dnl $Id: configure.in,v 1.187 2005-11-29 20:26:05 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.1.9)
+AM_INIT_AUTOMAKE(yaz, 2.1.10)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
diff --git a/debian/changelog b/debian/changelog
index d0dbc96..8187baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (2.1.10-1) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 29 Nov 2005 21:17:15 +0100
+
 yaz (2.1.9-2) unstable; urgency=low
 
   * Removed /usr/share/yaz/etc from libyaz. All /usr/share/yaz content is
diff --git a/debian/rules b/debian/rules
index f70fda9..854878c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,7 @@ binary-arch: build install
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V 'libyaz (>= 2.1.5)'
+	dh_makeshlibs -V 'libyaz (>= 2.1.9)'
 	dh_installdeb
 	dh_shlibdeps  -l debian/libyaz/usr/lib
 	dh_gencontrol
diff --git a/win/yaz.nsi b/win/yaz.nsi
index c89ccdf..c7ecaef 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.70 2005-08-25 11:48:26 adam Exp $
+; $Id: yaz.nsi,v 1.71 2005-11-29 20:26:06 adam Exp $
 
-!define VERSION "2.1.8"
+!define VERSION "2.1.10"
 !define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
 
 !include "MUI.nsh"
diff --git a/win/yaz.rc b/win/yaz.rc
index fa0284e..e156715 100644
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,8,1
- PRODUCTVERSION 2,1,8,1
+ FILEVERSION 2,1,10,1
+ PRODUCTVERSION 2,1,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, 1, 8, 1\0"
+            VALUE "FileVersion", "2, 1, 10, 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, 8, 1\0"
+            VALUE "ProductVersion", "2, 1, 10, 1\0"
             VALUE "SpecialBuild", "\0"
         END
     END
-- 
1.7.10.4