Merge branch 'master' into sru_2_0

Conflicts:
	IDMETA
	debian/changelog
	debian/rules

diff --cc debian/changelog
index 5f2412f,2e1b3e5..7f3b93f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +yaz (5.0.0-1indexdata) unstable; urgency=low
 +
 +  * Version 5.
 +
 + -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 11 Sep 2013 09:26:11 +0200
 +
+ yaz (4.2.68-1indexdata) unstable; urgency=low
+ 
+   * Upstream.
+ 
+  -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 23 Sep 2013 10:10:59 +0200
+ 
  yaz (4.2.67-1indexdata) unstable; urgency=low
  
    * Upstram.

diff --cc debian/control
index ef506e8,0a978bf..eb4e1eb
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,9 -9,9 +9,9 @@@ Build-Depends: debhelper (>= 5)
        libgnutls-dev,
        libreadline-dev|libreadline5-dev,
        libwrap0-dev,
-       libicu36-dev | libicu-dev
+       libicu-dev
  
 -Package: libyaz4
 +Package: libyaz5
  Section: libs
  Architecture: any
  Depends: ${shlibs:Depends}
@@@ -52,11 -52,11 +52,11 @@@ Description: documentation for the Z39.
   .
   This package includes HTML documentation for YAZ.
  
 -Package: libyaz4-dev
 -Depends: libyaz4 (= ${Source-Version}),
 +Package: libyaz5-dev
 +Depends: libyaz5 (= ${Source-Version}),
        libxslt1-dev,
-       libicu36-dev|libicu-dev,
-       tcl8.3|tclsh
+       libicu-dev,
+       tclsh
  Provides: libyaz-dev
  Replaces: libyaz-dev
  Conflicts: libyaz2-dev, libyaz3-dev, libyaz-dev

diff --cc src/srwutil.c
Simple merge

diff --cc src/zoom-sru.c
Simple merge