Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

diff --git a/NEWS b/NEWS
index eb25879..38319ef 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,9 @@
---- 4.0.13 2010/MM/DD
+--- 4.1.0 2010/10/05
 
 SOLR WebService support for yaz-client and ZOOM.
 
+Define record syntax JSON. OID: 1.2.840.10003.5.1000.81.3 .
+
 --- 4.0.12 2010/08/17
 
 Z39.50 facet support. Facet specifications are passed for search in

diff --git a/configure.ac b/configure.ac
index a535994..90e4b79 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl This file is part of the YAZ toolkit.
 dnl Copyright (C) 1995-2010 Index Data
 AC_PREREQ([2.60])
-AC_INIT([yaz],[4.0.13],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.1.0],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.9])

diff --git a/debian/changelog b/debian/changelog
index ec61805..e05e845 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (4.1.0-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 05 Oct 2010 10:09:48 +0200
+
 yaz (4.0.13-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/doc/yaz-client-man.xml b/doc/yaz-client-man.xml
index 578db2e..c70327e 100644 (file)
--- a/doc/yaz-client-man.xml
+++ b/doc/yaz-client-man.xml
@@ -54,7 +54,7 @@
    you to test behavior and performance of Z39.50 targets and SRU servers.
   </para>
   <para>
-   From YAZ version 4.0.13, <command>yaz-client</command> may also operate as a
+   From YAZ version 4.1.0 <command>yaz-client</command> may also operate as a
    <ulink url="&url.solr;">SOLR</ulink> Web Service
    client.
   </para>