Merge branch 'master' into sru_2_0

Conflicts:
	IDMETA
	debian/changelog
	debian/rules

diff --cc debian/changelog
index 7f3b93f,43b548d..ed74690
--- 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.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 --cc debian/rules
index 68d3716,0435208..3102759
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -1,27 -1,106 +1,26 @@@
  #!/usr/bin/make -f
 -# -*- makefile -*-
 -# Sample debian/rules that uses debhelper.
 -# GNU copyright 1997 to 1999 by Joey Hess.
 +export DH_VERBOSE=1
  
 -# Uncomment this to turn on verbose mode.
 -#export DH_VERBOSE=1
 +%:
 +      dh $@ --without python-support
  
 -# These are used for cross-compiling and for saving the configure script
 -# from having to guess our platform (since we know it already)
 -DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 -DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 +override_dh_auto_configure:
 +      dh_auto_configure -- \
 +              --enable-tcpd --with-xslt --with-gnutls --with-icu
  
 +override_dh_strip:
 +      dh_strip --dbg-package=libyaz5-dbg
  
 -CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
 -CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
 -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 -
 -config.status: configure
 -      dh_testdir
 -      # Add here commands to configure the package.
 -      CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 -              LDFLAGS="$(LDFLAGS)" \
 -              ./configure --host=$(DEB_HOST_GNU_TYPE) \
 -              --build=$(DEB_BUILD_GNU_TYPE) \
 -              --mandir=\$${prefix}/share/man \
 -              --infodir=\$${prefix}/share/info \
 -              --enable-shared --enable-static --enable-tcpd \
 -              --with-xslt --with-gnutls --with-icu \
 -              --prefix=/usr
 -
 -build: build-stamp
 -build-stamp:  config.status
 -      dh_testdir
 -
 -      # Add here commands to compile the package.
 -      $(MAKE)
 -
 -      touch build-stamp
 -
 -clean:
 -      dh_testdir
 -      dh_testroot
 -      rm -f build-stamp 
 -
 -      # Add here commands to clean up after the build process.
 -      -$(MAKE) distclean
 -ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 -      -cp -f /usr/share/misc/config.sub config.sub
 -endif
 -ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 -      -cp -f /usr/share/misc/config.guess config.guess
 -endif
 -
 -      dh_clean 
 -
 -install: build
 -      dh_testdir
 -      dh_testroot
 -      dh_clean -k 
 -      dh_installdirs
 -
 -      # Add here commands to install the package into debian/tmp
 -      $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 +override_dh_auto_install:
 +      dh_auto_install 
 +      mv debian/tmp/usr/share/doc/yaz debian/tmp/usr/share/doc/yaz-doc
  
 +override_dh_makeshlibs:
 +      dh_makeshlibs -V 'libyaz5 (>= 5.0.0)'
  
 -# Build architecture-independent files here.
 -binary-indep: build install
 -# We have nothing to do by default.
 +override_dh_installchangelogs:
 +      dh_installchangelogs NEWS
  
 -# Build architecture-dependent files here.
 -binary-arch: build install
 -      dh_testdir
 -      dh_testroot
 +override_dh_installdocs:
        cp LICENSE debian/copyright
        dh_installdocs -A README
- 
 -      dh_installchangelogs 
 -      dh_installexamples
 -      mv debian/tmp/usr/share/doc/yaz debian/tmp/usr/share/doc/yaz-doc
 -      dh_install 
 -#     dh_installmenu
 -#     dh_installdebconf       
 -#     dh_installlogrotate
 -#     dh_installemacsen
 -#     dh_installpam
 -#     dh_installmime
 -#     dh_installinit
 -#     dh_installcron
 -#     dh_installinfo
 -      dh_installman
 -      dh_link
 -      dh_strip --dbg-package=libyaz4-dbg
 -      dh_compress
 -      dh_fixperms
 -#     dh_perl
 -#     dh_python
 -      dh_makeshlibs -V 'libyaz4 (>= 4.2.69)'
 -      dh_installdeb
 -      dh_shlibdeps  -l debian/libyaz4/usr/lib
 -      dh_gencontrol
 -      dh_md5sums
 -      dh_builddeb
 -
 -binary: binary-indep binary-arch
 -.PHONY: build clean binary-indep binary-arch binary install