From: Dennis Schafroth <dennis@indexdata.com>
Date: Mon, 17 May 2010 09:24:51 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.0.9~5
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=a7eee1a2528940018127af361ba214b8688879f0;hp=1b814737d1572a6fc4bec2a3d120d6954d12bdb1

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

diff --git a/NEWS b/NEWS
index 701e717..9b99f35 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+--- 4.0.8 2010/05/11
+
+Debian package libyaz-dev depends on libgnutls-dev again (was
+removed in YAZ 4.0.6, but due to Libtool it is still needed
+even though yaz-config do not list libgnutls libs).
+
+ZOOM: Use only one WRBUF for returning string results for
+ZOOM_resultset. Reduces memory usage for ZOOM in general.
+
+ZOOM: ZOOM_connection do not use a shared pointer to
+ZOOM_resultset after ZOOM_resultset is destructed by
+user. Reverts to YAZ 4.0.4 behavior.
+
 --- 4.0.7 2010/05/04
 
 record-conv: fix problem with at least one XSL conversion -
diff --git a/configure.ac b/configure.ac
index ca20fbc..59a283c 100644
--- 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.7],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.0.8],[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 d3a95b4..9f0a2f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+yaz (4.0.8-2indexdata) unstable; urgency=low
+
+  * Remove *.la files
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 17 May 2010 10:42:22 +0200
+
+yaz (4.0.8-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 11 May 2010 12:46:05 +0200
+
 yaz (4.0.7-1indexdata) unstable; urgency=low
 
   * Upstream.
diff --git a/debian/control b/debian/control
index 911d10e..4e5a91d 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: documentation for the Z39.50 toolkit
  This package includes HTML documentation for YAZ.
 
 Package: libyaz4-dev
-Depends: libyaz4 (= ${Source-Version}), libxslt1-dev, libicu36-dev|libicu-dev, tcl8.3|tclsh
+Depends: libyaz4 (= ${Source-Version}), libxslt1-dev, libicu36-dev|libicu-dev, libgnutls-dev, tcl8.3|tclsh
 Replaces: yaz-devel
 Conflicts: yaz-devel, libyaz-dev, libyaz2-dev, libyaz3-dev
 Section: libdevel
diff --git a/debian/libyaz4-dev.install b/debian/libyaz4-dev.install
index 98e7964..5e8060d 100644
--- a/debian/libyaz4-dev.install
+++ b/debian/libyaz4-dev.install
@@ -2,7 +2,6 @@ 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
diff --git a/yaz.spec.in b/yaz.spec.in
index b111ff4..40a7783 100644
--- a/yaz.spec.in
+++ b/yaz.spec.in
@@ -107,7 +107,6 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/pkgconfig/yaz.pc
 %{_libdir}/*.so
 %{_libdir}/*.a
-%{_libdir}/*.la
 %{_datadir}/aclocal/yaz.m4
 %{_mandir}/man1/yaz-asncomp.*
 %{_mandir}/man7/yaz.*