Merge branch 'master' into yaz4

Conflicts:
	configure.ac
	debian/changelog

diff --git a/configure.ac b/configure.ac
index ee5b5bb..b5681aa 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-2009 Index Data
 AC_PREREQ([2.60])
-AC_INIT([yaz],[3.0.51],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.0.0],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.9])

diff --git a/debian/.gitignore b/debian/.gitignore
index efd5c63..dc3a5f9 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,7 +1,7 @@
 copyright
 files
-libyaz3
-libyaz3-dev
+libyaz4
+libyaz4-dev
 yaz-icu
 yaz-illclient
 tmp

diff --git a/debian/changelog b/debian/changelog
index 7608c07..89eec15 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-yaz (3.0.51-1indexdata) unstable; urgency=low
+yaz (4.0.0-1indexdata) unstable; urgency=low
 
-  * Upstream.
+  * Version 4.
 
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 26 Nov 2009 13:59:09 +0100
+ -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 25 Nov 2009 21:03:23 +0100
 
 yaz (3.0.50-1indexdata) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 4917800..d470832 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Priority: extra
 Build-Depends: debhelper (>= 4), pkg-config, libxslt1-dev, libgnutls-dev, libreadline5-dev, libwrap0-dev, libicu36-dev | libicu-dev
 
-Package: libyaz3
+Package: libyaz4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -36,10 +36,10 @@ Description: documentation for the Z39.50 toolkit
  .
  This package includes HTML documentation for YAZ.
 
-Package: libyaz3-dev
-Depends: libyaz3 (= ${Source-Version}), libxslt1-dev, libwrap0-dev, libicu36-dev|libicu-dev, libgnutls-dev, tcl8.3|tclsh
+Package: libyaz4-dev
+Depends: libyaz4 (= ${Source-Version}), libxslt1-dev, libwrap0-dev, libicu36-dev|libicu-dev, libgnutls-dev, tcl8.3|tclsh
 Replaces: yaz-devel
-Conflicts: yaz-devel, libyaz-dev, libyaz2-dev
+Conflicts: yaz-devel, libyaz-dev, libyaz2-dev, libyaz3-dev
 Section: libdevel
 Architecture: any
 Suggests: yaz-doc

diff --git a/debian/libyaz3-dev.install b/debian/libyaz3-dev.install
deleted file mode 100644 (file)
index 98e7964..0000000
--- a/debian/libyaz3-dev.install
+++ /dev/null
@@ -1,9 +0,0 @@
-debian/tmp/usr/include/yaz
-debian/tmp/usr/lib/pkgconfig/yaz.pc
-debian/tmp/usr/lib/libyaz*.a
-debian/tmp/usr/lib/libyaz*.so
-debian/tmp/usr/lib/libyaz*.la
-debian/tmp/usr/bin/yaz-config
-debian/tmp/usr/bin/yaz-asncomp
-debian/tmp/usr/share/aclocal/yaz.m4
-debian/tmp/usr/share/yaz

diff --git a/debian/libyaz3-dev.manpages b/debian/libyaz3-dev.manpages
deleted file mode 100644 (file)
index 174644c..0000000
--- a/debian/libyaz3-dev.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/share/man/man1/yaz-asncomp.1
-debian/tmp/usr/share/man/man7/yaz.7
-debian/tmp/usr/share/man/man8/yaz-config.8

diff --git a/debian/libyaz3.install b/debian/libyaz3.install
deleted file mode 100644 (file)
index c45ebcf..0000000
--- a/debian/libyaz3.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*

diff --git a/debian/libyaz4-dev.install b/debian/libyaz4-dev.install
new file mode 100644 (file)
index 0000000..98e7964
--- /dev/null
+++ b/debian/libyaz4-dev.install
@@ -0,0 +1,9 @@
+debian/tmp/usr/include/yaz
+debian/tmp/usr/lib/pkgconfig/yaz.pc
+debian/tmp/usr/lib/libyaz*.a
+debian/tmp/usr/lib/libyaz*.so
+debian/tmp/usr/lib/libyaz*.la
+debian/tmp/usr/bin/yaz-config
+debian/tmp/usr/bin/yaz-asncomp
+debian/tmp/usr/share/aclocal/yaz.m4
+debian/tmp/usr/share/yaz

diff --git a/debian/libyaz4-dev.manpages b/debian/libyaz4-dev.manpages
new file mode 100644 (file)
index 0000000..174644c
--- /dev/null
+++ b/debian/libyaz4-dev.manpages
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man1/yaz-asncomp.1
+debian/tmp/usr/share/man/man7/yaz.7
+debian/tmp/usr/share/man/man8/yaz-config.8

diff --git a/debian/libyaz4.install b/debian/libyaz4.install
new file mode 100644 (file)
index 0000000..c45ebcf
--- /dev/null
+++ b/debian/libyaz4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*

diff --git a/debian/rules b/debian/rules
index b540ef2..0e24dcf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -98,9 +98,9 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
-       dh_makeshlibs -V 'libyaz3 (>= 3.0.46)'
+       dh_makeshlibs -V 'libyaz4 (>= 4.0.0)'
        dh_installdeb
-       dh_shlibdeps  -l debian/libyaz3/usr/lib
+       dh_shlibdeps  -l debian/libyaz4/usr/lib
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/include/yaz/backend.h b/include/yaz/backend.h
index 5667e5c..5eac060 100644 (file)
--- a/include/yaz/backend.h
+++ b/include/yaz/backend.h
@@ -87,7 +87,6 @@ typedef struct {
     bend_request request;
     bend_association association;
 
-    int hits;                  /* number of hits */
     int errcode;               /* 0==OK */
     char *errstring;           /* system error string or NULL */
 } bend_present_rr;

diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h
index 9364323..8e49fee 100644 (file)
--- a/include/yaz/nmem.h
+++ b/include/yaz/nmem.h
@@ -43,8 +43,14 @@ YAZ_BEGIN_CDECL
 /** \brief NMEM handle (an opaque pointer to memory) */
 typedef struct nmem_control *NMEM;
 
-/** \brief Set to 1 if YAZ BER integer is 64-bit ; 0 otherwise */
+#ifdef _MSC_VER
 #define NMEM_64 0
+#endif
+
+/** \brief Set to 1 if YAZ BER integer is 64-bit ; 0 otherwise */
+#ifndef NMEM_64
+#define NMEM_64 1
+#endif
 
 #if NMEM_64
 /** \brief BER/utility integer (64-bit or more) */

diff --git a/src/Makefile.am b/src/Makefile.am
index ee24dba..9f8c018 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1995-2009 Index Data
 
-YAZ_VERSION_INFO=3:0:0
+YAZ_VERSION_INFO=4:0:0
 
 lib_LTLIBRARIES = libyaz.la libyaz_server.la libyaz_icu.la