Bump to SO version 5, towards 1.4.0

diff --git a/IDMETA b/IDMETA
index 05c4ba7..213aebd 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="wheezy squeeze"
 UBUNTU_DIST="precise oneiric natty lucid"
 CENTOS_DIST="centos5 centos6"
-VERSION=1.3.3
+VERSION=1.4.0

diff --git a/NEWS b/NEWS
index 774ffe0..26ec579 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+--- 1.4.0 2012/11/12
+
+Pimpl some public classes SocketManager, Z_Assoc, PDU_Assoc,
+and RecordCache.
+
+New PDU_Assoc method get_comstack. Allows us to change COMSTACK
+settings, such as max_recv_bytes.
+
 --- 1.3.3 2012/08/26
 
 Release for CentOS 6.

diff --git a/debian/changelog b/debian/changelog
index a01f29b..d68c499 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yazpp (1.4.0-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 12 Nov 2012 14:17:51 +0100
+
 yazpp (1.3.3-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/debian/control b/debian/control
index 0d470ed..9ebe0e5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,18 +7,20 @@ Build-Depends: debhelper (>= 4.0.0),
        libxml2-dev, libxslt1-dev,
        libyaz4-dev (>= 4.2.8)
 
-Package: libyazpp4
+Package: libyazpp5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: YAZ++ and ZOOM library
  YAZ++ is a C++ library with an object oriented interface to YAZ and ZOOM.
 
-Package: libyazpp4-dev
+Package: libyazpp5-dev
 Section: libdevel
 Architecture: any
-Conflicts: libyazpp-dev, libyazpp2-dev, libyazpp3-dev
-Depends: libyazpp4 (= ${Source-Version}), libyaz4-dev
+Conflicts: libyazpp-dev, libyazpp2-dev, libyazpp3-dev, libyazpp4-dev
+Provides: libyazpp-dev
+Replaces: libyazpp-dev
+Depends: libyazpp5 (= ${Source-Version}), libyaz4-dev
 Description: Development libraries for YAZ++ and ZOOM
  YAZ++ is a C++ library with an object oriented interface to YAZ and ZOOM.
 

diff --git a/debian/libyazpp4-dev.install b/debian/libyazpp4-dev.install
deleted file mode 100644 (file)
index 3b0fa09..0000000
--- a/debian/libyazpp4-dev.install
+++ /dev/null
@@ -1,9 +0,0 @@
-debian/tmp/usr/include/yazpp/*.h
-debian/tmp/usr/lib/libyazpp*.a
-debian/tmp/usr/lib/libzoompp*.a
-debian/tmp/usr/lib/libyazpp.so
-debian/tmp/usr/lib/libzoompp.so
-debian/tmp/usr/bin/yazpp-config
-debian/tmp/usr/share/aclocal/yazpp.m4
-debian/tmp/usr/share/man/man1/yazpp-config.1
-

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

diff --git a/debian/rules b/debian/rules
index 03fb19f..10d3b56 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -95,9 +95,9 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
-       dh_makeshlibs -V 'libyazpp4 (>= 1.3.1)'
+       dh_makeshlibs -V 'libyazpp5 (>= 1.4.0)'
        dh_installdeb
-       dh_shlibdeps -l debian/libyazpp4/usr/lib
+       dh_shlibdeps -l debian/libyazpp5/usr/lib
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/src/Makefile.am b/src/Makefile.am
index bc2e296..25781c8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ TESTS = $(check_PROGRAMS)
 AM_CXXFLAGS = -I$(srcdir)/../include $(YAZINC)
 
 lib_LTLIBRARIES = libyazpp.la
-libyazpp_la_LDFLAGS=-version-info 4:0:0
+libyazpp_la_LDFLAGS=-version-info 5:0:0
 
 DISTCLEANFILES = yazpp-config
 

diff --git a/yazpp.spec b/yazpp.spec
index bbf4714..d78b489 100644 (file)
--- a/yazpp.spec
+++ b/yazpp.spec
@@ -16,20 +16,21 @@ URL: http://www.indexdata.com/yazplusplus
 %description
 YAZ++ package.
 
-%package -n libyazpp4
+%package -n libyazpp5
 Summary: YAZ++ and ZOOM library
 Group: Libraries
 Requires: libyaz4 >= 4.2.8
 
-%description -n libyazpp4
+%description -n libyazpp5
 Libraries for the YAZ++ package.
 
-%package -n libyazpp4-devel
+%package -n libyazpp5-devel
 Summary: Z39.50 Library - development package
 Group: Development/Libraries
-Requires: libyazpp4 = %{version}, libyaz4-devel
+Requires: libyazpp5 = %{version}, libyaz4-devel
+Conflicts: libyazpp4-devel
 
-%description -n libyazpp4-devel
+%description -n libyazpp5-devel
 Development libraries and include files for the YAZ++ package.
 
 %prep
@@ -51,15 +52,15 @@ rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la
 %clean
 rm -fr ${RPM_BUILD_ROOT}
 
-%post -n libyazpp4 -p /sbin/ldconfig 
-%postun -n libyazpp4 -p /sbin/ldconfig 
+%post -n libyazpp5 -p /sbin/ldconfig 
+%postun -n libyazpp5 -p /sbin/ldconfig 
 
-%files -n libyazpp4
+%files -n libyazpp5
 %doc README LICENSE NEWS
 %defattr(-,root,root)
 %{_libdir}/*.so.*
 
-%files -n libyazpp4-devel
+%files -n libyazpp5-devel
 %defattr(-,root,root)
 %{_bindir}/yazpp-config
 %{_includedir}/yazpp