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

diff --git a/IDMETA b/IDMETA
index 924cd13..8f031e0 100755 (executable)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="jessie wheezy"
 UBUNTU_DIST="wily vivid trusty precise"
 CENTOS_DIST="centos5 centos6 centos7"
-VERSION=5.15.0
+VERSION=5.15.1

diff --git a/Makefile.am b/Makefile.am
index a00c190..1f24860 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = yaz.pc
 
 SPEC_FILE=$(PACKAGE).spec
-EXTRA_DIST=$(SPEC_FILE) IDMETA README LICENSE NEWS m4/id-config.sh \
+EXTRA_DIST=$(SPEC_FILE) IDMETA README.md LICENSE NEWS m4/id-config.sh \
        yaz-config.in yaz.pc.in m4/yaz.m4 m4/yaz_libxml2.m4 buildconf.sh \
        Doxyfile.in m4/acx_pthread.m4 m4/ac_check_icu.m4
 

diff --git a/NEWS b/NEWS
index a718179..a9b2ce3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+--- 5.15.1 2015/11/12
+
+Bundle sha1 rather than use libgcrypt/nettle. This means that
+configure no longer accepts --with-gcrypt and --with-nettle.
+
+Fix rpn2cql fails for Bib-1 set in qry+conf YAZ-865
+
 --- 5.15.0 2015/11/11
 
 CCL: fix r=o, r=r WRT inherited attributes YAZ-864

diff --git a/README b/README
deleted file mode 100644 (file)
index 0fce06f..0000000
--- a/README
+++ /dev/null
@@ -1,46 +0,0 @@
-YAZ toolkit
-
-Copyright (C) 1995-2015 Index Data.
-See the file LICENSE for details.
-
-The primary output of the source here is the YAZ library, which
-contains support functions for implementing the server or client
-role of Z39.50 and SRU.
-
-On Unix, GNU configure is used to configure YAZ and generate Makefiles.
-Type "./configure", then "make" to build YAZ. Read
-doc/installation.unix.html for details.
-
-On Windows, a MS Visual Studio makefile is provided (nmake). The commands
-  cd \win
-  nmake
-should do. Refer to doc/installation.win32.html for details.
-
-Note: If you are using the Git snapshot of YAZ you must have autoconf,
-automake, libtool and xsltproc installed. Before running configure, create
-support files by running buildconf.sh in the top-level directory of YAZ.  
-
-In any case refer to the documentation in sub directory doc or read
-it online at http://www.indexdata.com/yaz/
-
-File organisation:
-
-doc      Documentation.
-
-src      Source for the YAZ library.
-
-util     Utility programs, ASN.1 compiler, MARC dump utility, and others.
-
-client   A demonstration client for testing the protocol. It's bug'n
-         ugly. But, it supports many features.
-
-ztest    A demonstration server that implements a backend.
-
-etc      Various configuration files.
-
-include/yaz The various header files.
-
-To get more information or assistance, send mail to yaz-help@indexdata.dk.
-Even better, sign on to the YAZ mailing list here:
-http://lists.indexdata.dk/cgi-bin/mailman/listinfo/yazlist
-

diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..c0df73f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,17 @@
+## YAZ toolkit
+
+Copyright (C) 1995-2015 Index Data.
+See the file LICENSE for details.
+
+The primary output of the source here is the
+[YAZ](http://www.indexdata.com/yaz) library, which contains support
+functions for implementing the server or client role of Z39.50 and SRU.
+
+For more information about YAZ refer to the documentation in sub
+directory `doc` or 
+[online](http://www.indexdata.com/yaz/doc).
+
+To get more information or assistance, send mail to yaz-help@indexdata.dk.
+Even better, sign on to the
+[YAZ mailing list](http://lists.indexdata.dk/cgi-bin/mailman/listinfo/yazlist)
+

diff --git a/debian/rules b/debian/rules
index 3d2eaf2..1ae2907 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -24,4 +24,4 @@ override_dh_installchangelogs:
 
 override_dh_installdocs:
        cp LICENSE debian/copyright
-       dh_installdocs -A README
+       dh_installdocs -A README.md

diff --git a/doc/bib1-attr-man.xml b/doc/bib1-attr-man.xml
index 8050297..10e6433 100644 (file)
--- a/doc/bib1-attr-man.xml
+++ b/doc/bib1-attr-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/book.xml b/doc/book.xml
index d244cc4..8bb42c0 100644 (file)
--- a/doc/book.xml
+++ b/doc/book.xml
@@ -925,7 +925,7 @@
      &yaz; is shipped with "makefiles" for the NMAKE tool that comes
      with <ulink url="&url.vstudio;">
      Microsoft Visual Studio</ulink>. It has been tested with
-     Microsoft Visual Studio 2013.
+     Microsoft Visual Studio 2015.
     </para>
     <para>
      Start a command prompt and switch the sub directory
@@ -969,8 +969,8 @@
        (<filename>cql.y</filename>).
        </para>
        <para>
-       A Windows version of GNU Bison is part of
-       <ulink url="&url.gitwindows;">Git for Windows</ulink>.
+       A Windows version of GNU Bison can be fetched from here:
+       <ulink url="http://ftp.indexdata.dk/pub/support/windows/bison-2.4.1-setup.exe"/>.
        </para></listitem>
       </varlistentry>
       <varlistentry>

diff --git a/doc/yaz-asncomp-man.xml b/doc/yaz-asncomp-man.xml
index 18b6146..5fa8bc4 100644 (file)
--- a/doc/yaz-asncomp-man.xml
+++ b/doc/yaz-asncomp-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-client-man.xml b/doc/yaz-client-man.xml
index 7b72019..870d22d 100644 (file)
--- a/doc/yaz-client-man.xml
+++ b/doc/yaz-client-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-config-man.xml b/doc/yaz-config-man.xml
index c66a59a..74b134d 100644 (file)
--- a/doc/yaz-config-man.xml
+++ b/doc/yaz-config-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-iconv-man.xml b/doc/yaz-iconv-man.xml
index a920109..3e77717 100644 (file)
--- a/doc/yaz-iconv-man.xml
+++ b/doc/yaz-iconv-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-icu-man.xml b/doc/yaz-icu-man.xml
index d0fd43c..6be364d 100644 (file)
--- a/doc/yaz-icu-man.xml
+++ b/doc/yaz-icu-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-illclient-man.xml b/doc/yaz-illclient-man.xml
index 5599a0a..42fc70a 100644 (file)
--- a/doc/yaz-illclient-man.xml
+++ b/doc/yaz-illclient-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-json-parse-man.xml b/doc/yaz-json-parse-man.xml
index 1df0a22..8996c97 100644 (file)
--- a/doc/yaz-json-parse-man.xml
+++ b/doc/yaz-json-parse-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-log-man.xml b/doc/yaz-log-man.xml
index 367712b..d3d4db5 100644 (file)
--- a/doc/yaz-log-man.xml
+++ b/doc/yaz-log-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-man.xml b/doc/yaz-man.xml
index e8d04f5..f5773e9 100644 (file)
--- a/doc/yaz-man.xml
+++ b/doc/yaz-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-marcdump-man.xml b/doc/yaz-marcdump-man.xml
index a96fc1a..7fd40fe 100644 (file)
--- a/doc/yaz-marcdump-man.xml
+++ b/doc/yaz-marcdump-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-url-man.xml b/doc/yaz-url-man.xml
index c389de8..d1e4a12 100644 (file)
--- a/doc/yaz-url-man.xml
+++ b/doc/yaz-url-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/yaz-ztest-man.xml b/doc/yaz-ztest-man.xml
index 6d1cc23..d593a2b 100644 (file)
--- a/doc/yaz-ztest-man.xml
+++ b/doc/yaz-ztest-man.xml
@@ -15,7 +15,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/doc/zoomsh-man.xml b/doc/zoomsh-man.xml
index e65bba0..a9390d4 100644 (file)
--- a/doc/zoomsh-man.xml
+++ b/doc/zoomsh-man.xml
@@ -12,7 +12,7 @@
  <refentryinfo>
   <productname>YAZ</productname>
   <productnumber>&version;</productnumber>
-  <info><orgname>Index Data</orgname></info>
+  <orgname>Index Data</orgname>
  </refentryinfo>
 
  <refmeta>

diff --git a/src/wrbuf_sha1.c b/src/wrbuf_sha1.c
index 733d8a2..16be5bd 100644 (file)
--- a/src/wrbuf_sha1.c
+++ b/src/wrbuf_sha1.c
@@ -28,7 +28,12 @@ By Steve Reid <steve@edmweb.com>
 
 #define SHA1HANDSOFF
 
+/* VS 2010 and later have stdint.h */
+#if defined(_MSC_VER) && _MSC_VER < 1600
+typedef unsigned int uint32_t;
+#else
 #include <stdint.h>
+#endif
 
 typedef struct {
     uint32_t state[5];

diff --git a/test/test_rpn2cql.c b/test/test_rpn2cql.c
index 2dba3cf..411f176 100644 (file)
--- a/test/test_rpn2cql.c
+++ b/test/test_rpn2cql.c
@@ -89,6 +89,10 @@ static void tst1(void)
 
     cql_transform_define_pattern(ct, "index.foo", "1=bar");
     YAZ_CHECK(compare(ct, "@attr 1=bar abc", "foo=abc"));
+    YAZ_CHECK(compare(ct, "@attr bib1 1=bar abc", "foo=abc"));
+
+    cql_transform_define_pattern(ct, "index.author", "bib1 1=1003 4=2");
+    YAZ_CHECK(compare(ct, "@attr 4=2 @attr bib1 1=1003 abc", "author=abc"));
 
     cql_transform_close(ct);
 }

diff --git a/win/yaz.nsi b/win/yaz.nsi
index bc1bd39..7bfda90 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -101,7 +101,7 @@ Section "" ; (default section)
                "$INSTDIR\uninst.exe"
        SetOutPath $INSTDIR
        File LICENSE.txt
-       File ..\README
+       File ..\README.md
        File ..\NEWS
        SetOutPath $INSTDIR
        SetOutPath $INSTDIR\ztest

diff --git a/yaz.spec b/yaz.spec
index e654ca5..3ec25e7 100644 (file)
--- a/yaz.spec
+++ b/yaz.spec
@@ -122,7 +122,7 @@ rm -fr ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
-%doc README LICENSE NEWS
+%doc README.md LICENSE NEWS
 %{_bindir}/yaz-client
 %{_bindir}/yaz-ztest
 %{_bindir}/zoomsh