Version 4.2.0

diff --git a/NEWS b/NEWS
index db88861..999b5fb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+--- 4.2.0 2011/05/18
+
+CQL: parse CQL sortby spec. The resulting sort spec is stored in the
+resulting CQL node (tree) in a new node CQL_NODE_SORT.
+
+CQL and GFS: add utility cql_sortby_to_sortkeys which converts CQL sortby
+1.2 node tree to CQL 1.1 spec. This in turn allows the generic frontend
+server to only consider srw_sortkeys and support both SRU 1.1 and 1.2.
+Note that the CQL sortby spec is only converted when the GFS is already
+converting from CQL to RPN (cql2rpn element).
+
+New function nmem_strsplitx. This is like nmem_strsplit but allows us to
+specify whether to collapse delimitors or not. The existing nmem_strsplit
+do collapse (collapse parameter = 1).
+
+Windows installer: For NSIS, set InstallDir depending on x86/x64.
+
+Rename internal func yaz_use_attribute_create. While non-static, this
+function is not declared in a public header.
+

 --- 4.1.7 2011/03/15
 
 Add -lCrun when linking with ICU on Solaris.
 --- 4.1.7 2011/03/15
 
 Add -lCrun when linking with ICU on Solaris.

diff --git a/README b/README
index bf97591..3ba2299 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 YAZ toolkit
 
 YAZ toolkit
 

-Copyright (C) 1995-2010 Index Data ApS.
+Copyright (C) 1995-2011 Index Data ApS.

 See the file LICENSE for details.
 
 The primary output of the source here is the YAZ library, which
 See the file LICENSE for details.
 
 The primary output of the source here is the YAZ library, which

diff --git a/configure.ac b/configure.ac
index 441b971..d72b51e 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-2011 Index Data
 AC_PREREQ([2.60])
 dnl This file is part of the YAZ toolkit.
 dnl Copyright (C) 1995-2011 Index Data
 AC_PREREQ([2.60])

-AC_INIT([yaz],[4.1.7],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.2.0],[yaz-help@indexdata.dk])

 AC_CONFIG_HEADERS(include/config.h)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_HEADERS(include/config.h)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])

diff --git a/debian/changelog b/debian/changelog
index dc2cf57..f48fa25 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (4.2.0-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 18 May 2011 12:13:54 +0000
+

 yaz (4.1.7-1indexdata) unstable; urgency=low
 
   * Upstream.
 yaz (4.1.7-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/debian/rules b/debian/rules
index db5e508..16d0c2d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,7 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
        dh_fixperms
 #      dh_perl
 #      dh_python

-       dh_makeshlibs -V 'libyaz4 (>= 4.1.5)'
+       dh_makeshlibs -V 'libyaz4 (>= 4.2.0)'

        dh_installdeb
        dh_shlibdeps  -l debian/libyaz4/usr/lib
        dh_gencontrol
        dh_installdeb
        dh_shlibdeps  -l debian/libyaz4/usr/lib
        dh_gencontrol

diff --git a/yaz.spec b/yaz.spec
index ac8fcc7..8985c0b 100644 (file)
--- a/yaz.spec
+++ b/yaz.spec
@@ -5,7 +5,7 @@
 
 Name: yaz
 Summary: Z39.50 Programs
 
 Name: yaz
 Summary: Z39.50 Programs

-Version: 4.1.7
+Version: 4.2.0

 Release: 1indexdata
 
 # determine system
 Release: 1indexdata
 
 # determine system