From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 1 Oct 2013 08:03:39 +0000 (+0200)
Subject: Merge branch 'master' into sru_2_0
X-Git-Tag: v5.0.0~13
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=c4ca7f07c98c0cde1978b8b7f2140ce74ba809d7;hp=54823fb816a4bc3366d1091bbdbf1df88bcf2451;p=yaz-moved-to-github.git

Merge branch 'master' into sru_2_0

Conflicts:
	IDMETA
	debian/changelog
	debian/rules
---

diff --git a/NEWS b/NEWS
index c403130..9753f18 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,37 @@
+--- 4.2.69 2013/10/01
+
+GFS: log when closing down - at least SIGTERM YAZ-684
+Also change formatting WRT PID logging a bit.
+
+Improve display of MARC records with multi-byte subfield IDs YAZ-695
+In some rare cases subfield identifiers are multi-byte characters.
+This will try to deterime length of those and split accordingly.
+This affects display in line mode as MARCXML/MarcXchange. The encoding
+of ISO2709 is the same.
+
+Change inp argument to const for yaz_read_UTF8_char.
+
+yaz-marcdump: fix leaks for MARCXML parsing. YAZ-694
+
+MARCXML parsing: avoid skipping 1st field if no leader. YAZ-693
+
+Better check of marc leader info YAZ-691
+Problem is that some systems generate MARCXML/MarcXchange with
+funny headers. These will not work if encoded as ISO2709.
+Some tests produce new output, due to updated warning messages
+
+cql2pqf: allow PQF queries from stdin (because CQL is also allowed)
+
+yaz-client: display MAB records YAZ-689.
+Thanks for Heiko Jansen for this patch.
+
+New utility z_get_HTTP_Response_server which allows both HTTP server name
+and HTTP server URL to be given in response.
+
+Debian: do not depend on obs tcl8.3.
+
+Debian: do not depend on obs libicu36-dev.
+
 --- 4.2.68 2013/09/23 
 
 GFS: pass additionalSearchInfo to search memeber search_input if
diff --git a/debian/.gitignore b/debian/.gitignore
index dc3a5f9..982cdf3 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,6 +1,7 @@
 copyright
 files
 libyaz4
+libyaz4-dbg
 libyaz4-dev
 yaz-icu
 yaz-illclient
diff --git a/debian/changelog b/debian/changelog
index 7f3b93f..ed74690 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ yaz (5.0.0-1indexdata) unstable; urgency=low
 
  -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 11 Sep 2013 09:26:11 +0200
 
+yaz (4.2.69-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 01 Oct 2013 09:42:46 +0200
+
 yaz (4.2.68-1indexdata) unstable; urgency=low
 
   * Upstream.
diff --git a/debian/rules b/debian/rules
index 68d3716..3102759 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,4 +24,3 @@ override_dh_installchangelogs:
 override_dh_installdocs:
 	cp LICENSE debian/copyright
 	dh_installdocs -A README
-