Version 5

diff --git a/IDMETA b/IDMETA
index d156969..16d4635 100755 (executable)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="wheezy squeeze"
 UBUNTU_DIST="quantal precise oneiric lucid"
 CENTOS_DIST="centos5 centos6"
-VERSION=4.2.65
+VERSION=5.0.0

diff --git a/debian/changelog b/debian/changelog
index 2c2cb69..d8299ee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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.65-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/debian/control b/debian/control
index b4fe544..ef506e8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5),
        libwrap0-dev,
        libicu36-dev | libicu-dev
 
-Package: libyaz4
+Package: libyaz5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -22,15 +22,15 @@ Description: libraries for the Z39.50 toolkit
  .
  This package includes runtime files.
 
-Package: libyaz4-dbg
+Package: libyaz5-dbg
 Section: debug
 Architecture: any
-Depends: libyaz4 (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for libyaz4
+Depends: libyaz5 (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for libyaz5
  YAZ is a toolkit that allows you to develop software using the
  ANSI Z39.50/ISO23950 standard for information retrieval.
  .
- This package contains the debugging symbols for libyaz4.
+ This package contains the debugging symbols for libyaz5.
 
 Package: yaz
 Section: utils
@@ -52,8 +52,8 @@ Description: documentation for the Z39.50 toolkit
  .
  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

diff --git a/debian/libyaz4-dev.install b/debian/libyaz4-dev.install
deleted file mode 100644 (file)
index 5e8060d..0000000
--- a/debian/libyaz4-dev.install
+++ /dev/null
@@ -1,8 +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/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
deleted file mode 100644 (file)
index 5c7701f..0000000
--- a/debian/libyaz4-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/man1/yaz-config.1

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

diff --git a/debian/libyaz5-dev.install b/debian/libyaz5-dev.install
new file mode 100644 (file)
index 0000000..5e8060d
--- /dev/null
+++ b/debian/libyaz5-dev.install
@@ -0,0 +1,8 @@
+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/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/libyaz5-dev.manpages b/debian/libyaz5-dev.manpages
new file mode 100644 (file)
index 0000000..5c7701f
--- /dev/null
+++ b/debian/libyaz5-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/man1/yaz-config.1

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

diff --git a/debian/rules b/debian/rules
index c09b7e7..441f8ab 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -90,14 +90,14 @@ binary-arch: build install
 #      dh_installinfo
        dh_installman
        dh_link
-       dh_strip --dbg-package=libyaz4-dbg
+       dh_strip --dbg-package=libyaz5-dbg
        dh_compress
        dh_fixperms
 #      dh_perl
 #      dh_python
-       dh_makeshlibs -V 'libyaz4 (>= 4.2.63)'
+       dh_makeshlibs -V 'libyaz5 (>= 5.0.0)'
        dh_installdeb
-       dh_shlibdeps  -l debian/libyaz4/usr/lib
+       dh_shlibdeps  -l debian/libyaz5/usr/lib
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/src/Makefile.am b/src/Makefile.am
index 3b1abdd..2564e03 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-2013 Index Data
 
-YAZ_VERSION_INFO=4:0:0
+YAZ_VERSION_INFO=5:0:0
 
 lib_LTLIBRARIES = libyaz.la libyaz_server.la libyaz_icu.la
 

diff --git a/yaz.spec b/yaz.spec
index 8939cf4..05211a6 100644 (file)
--- a/yaz.spec
+++ b/yaz.spec
@@ -14,7 +14,7 @@ Release: 1indexdata
 %define is_suse %(test -e /etc/SuSE-release >/dev/null && echo 1 || echo 0)
 %define is_suse11 %(grep 'VERSION = 11' /etc/SuSE-release >/dev/null 2>&1 && echo 1 || echo 0)
 %define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
-Requires: libxslt, gnutls, readline, libyaz4 = %{version}
+Requires: libxslt, gnutls, readline, libyaz5 = %{version}
 License: BSD
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
@@ -52,31 +52,31 @@ URL: http://www.indexdata.com/yaz
 This package contains both a test-server and clients (normal & ssl)
 for the ANSI/NISO Z39.50 protocol for Information Retrieval.
 
-%package -n libyaz4
+%package -n libyaz5
 Summary: Z39.50 Library
 Group: Libraries
 Requires: libxslt, gnutls, libicu
 
-%description -n libyaz4
+%description -n libyaz5
 YAZ is a library for the ANSI/NISO Z39.50 protocol for Information
 Retrieval.
 
-%post -n libyaz4 -p /sbin/ldconfig 
-%postun -n libyaz4 -p /sbin/ldconfig 
+%post -n libyaz5 -p /sbin/ldconfig 
+%postun -n libyaz5 -p /sbin/ldconfig 
 
-%package -n libyaz4-devel
+%package -n libyaz5-devel
 Summary: Z39.50 Library - development package
 Group: Development/Libraries
-Requires: libyaz4 = %{version}, libxml2-devel, libxslt-devel, libicu-devel
-Conflicts: libyaz-devel
+Requires: libyaz5 = %{version}, libxml2-devel, libxslt-devel, libicu-devel
+Conflicts: libyaz-devel, libyaz4-devel
 
-%description -n libyaz4-devel
+%description -n libyaz5-devel
 Development libraries and includes for the libyaz package.
 
 %package -n yaz-illclient
 Summary: ILL client
 Group: Applications/Communication
-Requires: readline, libyaz4 = %{version}
+Requires: readline, libyaz5 = %{version}
 
 %description -n yaz-illclient
 yaz-illclient: an ISO ILL client.
@@ -84,7 +84,7 @@ yaz-illclient: an ISO ILL client.
 %package -n yaz-icu
 Summary: Command line utility for ICU utilities of YAZ
 Group: Applications/Communication
-Requires: libyaz4 = %{version}
+Requires: libyaz5 = %{version}
 
 %description -n yaz-icu
 The yaz-icu program is a command-line based client which exposes the ICU
@@ -128,11 +128,11 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_mandir}/man7/yaz-log.*
 %{_mandir}/man7/bib1-attr.*
 
-%files -n libyaz4
+%files -n libyaz5
 %defattr(-,root,root)
 %{_libdir}/*.so.*
 
-%files -n libyaz4-devel
+%files -n libyaz5-devel
 %defattr(-,root,root)
 %{_bindir}/yaz-config
 %{_bindir}/yaz-asncomp