From a438a0f4fd42a689441dd4a5131cf53704d338ec Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 21 Jan 2008 16:10:08 +0000 Subject: [PATCH] Update to lib version 3, because API has changed. --- NEWS | 2 ++ configure.ac | 6 +++--- debian/changelog | 6 ++++++ debian/control | 8 ++++---- debian/libyazpp2-dev.install | 10 ---------- debian/libyazpp2.install | 2 -- debian/libyazpp3-dev.install | 10 ++++++++++ debian/libyazpp3.install | 2 ++ debian/rules | 4 ++-- src/Makefile.am | 4 ++-- 10 files changed, 31 insertions(+), 23 deletions(-) delete mode 100644 debian/libyazpp2-dev.install delete mode 100644 debian/libyazpp2.install create mode 100644 debian/libyazpp3-dev.install create mode 100644 debian/libyazpp3.install diff --git a/NEWS b/NEWS index 7eac9f0..bcd34d9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +--- 1.1.0 2008/MM/DD + --- 1.0.4 2007/11/12 SocketManager class implemented uses yaz_poll instead of select(2) diff --git a/configure.ac b/configure.ac index 070faf0..78534e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ -dnl YAZ++ Toolkit, Index Data 1994-2007 +dnl YAZ++ Toolkit, Index Data 1994-2008 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.19 2007-11-12 13:51:01 adam Exp $ +dnl $Id: configure.ac,v 1.20 2008-01-21 16:10:08 adam Exp $ AC_PREREQ(2.59) -AC_INIT([yazpp],[1.0.4],[adam@indexdata.dk]) +AC_INIT([yazpp],[1.1.0],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([1.8]) diff --git a/debian/changelog b/debian/changelog index eac76bc..edccbb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yazpp (1.1.0-1) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Mon, 21 Jan 2008 17:07:34 +0100 + yazpp (1.0.4-1) unstable; urgency=low * Upstream. diff --git a/debian/control b/debian/control index e263d3a..d0871b4 100644 --- a/debian/control +++ b/debian/control @@ -5,18 +5,18 @@ Maintainer: Adam Dickmeiss Standards-Version: 3.6.2 Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libyaz3-dev (>= 3.0.16) -Package: libyazpp2 +Package: libyazpp3 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: libyazpp2-dev +Package: libyazpp3-dev Section: devel Architecture: any -Conflicts: libyazpp-dev -Depends: libyazpp2 (= ${Source-Version}), libyaz3-dev +Conflicts: libyazpp-dev, libyazpp2-dev +Depends: libyazpp3 (= ${Source-Version}), libyaz3-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/libyazpp2-dev.install b/debian/libyazpp2-dev.install deleted file mode 100644 index 2736f25..0000000 --- a/debian/libyazpp2-dev.install +++ /dev/null @@ -1,10 +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/lib/libyazpp.la -debian/tmp/usr/lib/libzoompp.la -debian/tmp/usr/bin/yazpp-config -debian/tmp/usr/share/aclocal/yazpp.m4 -debian/tmp/usr/share/man/man8/yazpp-config.8 \ No newline at end of file diff --git a/debian/libyazpp2.install b/debian/libyazpp2.install deleted file mode 100644 index 0f88fb3..0000000 --- a/debian/libyazpp2.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libyazpp*.so.* -debian/tmp/usr/lib/libzoompp*.so.* diff --git a/debian/libyazpp3-dev.install b/debian/libyazpp3-dev.install new file mode 100644 index 0000000..2736f25 --- /dev/null +++ b/debian/libyazpp3-dev.install @@ -0,0 +1,10 @@ +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/lib/libyazpp.la +debian/tmp/usr/lib/libzoompp.la +debian/tmp/usr/bin/yazpp-config +debian/tmp/usr/share/aclocal/yazpp.m4 +debian/tmp/usr/share/man/man8/yazpp-config.8 \ No newline at end of file diff --git a/debian/libyazpp3.install b/debian/libyazpp3.install new file mode 100644 index 0000000..0f88fb3 --- /dev/null +++ b/debian/libyazpp3.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libyazpp*.so.* +debian/tmp/usr/lib/libzoompp*.so.* diff --git a/debian/rules b/debian/rules index 50f4371..5b7cc22 100755 --- a/debian/rules +++ b/debian/rules @@ -108,9 +108,9 @@ binary-arch: build install dh_fixperms # dh_perl # dh_python - dh_makeshlibs -V 'libyazpp2 (>= 1.0.2)' + dh_makeshlibs -V 'libyazpp3 (>= 1.1.0)' dh_installdeb - dh_shlibdeps -l debian/libyazpp2/usr/lib + dh_shlibdeps -l debian/libyazpp3/usr/lib dh_gencontrol dh_md5sums dh_builddeb diff --git a/src/Makefile.am b/src/Makefile.am index ad8b60f..1b7b3be 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.33 2007-03-20 16:21:58 adam Exp $ +## $Id: Makefile.am,v 1.34 2008-01-21 16:10:10 adam Exp $ check_PROGRAMS = tstquery noinst_PROGRAMS = yaz-my-server yaz-my-client @@ -9,7 +9,7 @@ TESTS = $(check_PROGRAMS) AM_CXXFLAGS = -I$(srcdir)/../include $(YAZINC) lib_LTLIBRARIES = libyazpp.la -libyazpp_la_LDFLAGS=-version-info 2:0:0 +libyazpp_la_LDFLAGS=-version-info 3:0:0 DISTCLEANFILES = yazpp-config -- 1.7.10.4