From 79076a95d4e3fc19cbf52bf2b7d35137809f3f7f Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 20 Mar 2007 16:21:58 +0000 Subject: [PATCH] Debian packages libyazpp2 and libyazpp2-dev. These depend on libyaz3, libyaz3-dev. --- Makefile.am | 3 +-- NEWS | 10 +++++++++- configure.ac | 4 ++-- debian/changelog | 14 +++---------- debian/control | 11 ++++++----- debian/libyazpp-dev.install | 10 ---------- debian/libyazpp1.install | 2 -- debian/libyazpp1.postinst | 45 ------------------------------------------ debian/libyazpp2-dev.install | 10 ++++++++++ debian/libyazpp2.install | 2 ++ debian/rules | 4 ++-- src/Makefile.am | 4 ++-- zoom/Makefile.am | 4 ++-- 13 files changed, 39 insertions(+), 84 deletions(-) delete mode 100644 debian/libyazpp-dev.install delete mode 100644 debian/libyazpp1.install delete mode 100755 debian/libyazpp1.postinst create mode 100644 debian/libyazpp2-dev.install create mode 100644 debian/libyazpp2.install diff --git a/Makefile.am b/Makefile.am index e489842..b11f392 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,14 +10,13 @@ aclocal_DATA = m4/yazpp.m4 EXTRA_DIST= LICENSE TODO yazpp-config.in m4/yaz.m4 m4/yazpp.m4 buildconf.sh dist-hook: - if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl ; fi + if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl ; cp ChangeLog $(distdir); fi mkdir $(distdir)/win cp $(srcdir)/win/makefile $(distdir)/win/ mkdir $(distdir)/debian cp $(srcdir)/debian/control $(distdir)/debian cp $(srcdir)/debian/changelog $(distdir)/debian cp $(srcdir)/debian/rules $(distdir)/debian - cp $(srcdir)/debian/*.postinst $(distdir)/debian cp $(srcdir)/debian/*.install $(distdir)/debian diff --git a/NEWS b/NEWS index b9da405..e658eea 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,14 @@ + +--- 1.0.3 in progress + +Debian libyazpp2 package; depending on libyaz3. + Change wording of YAZ++ license to the 'Revised BSD License'. -Added assignment operator for class Yaz_Z_Query. +Added assignment operator for class Yaz_Z_Query. This could break +binary layout. + +Branch out: YAZPP_1_0_2_branch. --- 1.0.0 2006/05/01 diff --git a/configure.ac b/configure.ac index 763a245..63d36b1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl YAZ++ Toolkit, Index Data 1994-2006 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.14 2007-03-20 07:54:11 adam Exp $ +dnl $Id: configure.ac,v 1.15 2007-03-20 16:21:58 adam Exp $ AC_PREREQ(2.59) -AC_INIT([yazpp],[1.0.2],[adam@indexdata.dk]) +AC_INIT([yazpp],[1.0.3],[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 3a33a01..a565bcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,6 @@ -yazpp (1.0.2-1) unstable; urgency=low +yazpp (1.0.3-1) unstable; urgency=low - * Upstream + * Upstream ; libyazpp2. - -- Marc Cromme Mon, 29 Jan 2007 14:25:56 +0100 - -yazpp (1.0.0-1) unstable; urgency=low - - * Removed docbook depends. Not needed becuase they're part of dist. - * Upstream - * Renaming from package name yaz++ to yazpp - - -- Adam Dickmeiss Mon, 1 May 2006 10:21:55 +0200 + -- Adam Dickmeiss Tue, 20 Mar 2007 09:03:53 +0100 diff --git a/debian/control b/debian/control index 334553a..a7946f1 100644 --- a/debian/control +++ b/debian/control @@ -3,19 +3,20 @@ Section: devel Priority: optional Maintainer: Adam Dickmeiss Standards-Version: 3.6.2 -Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libyaz-dev (>= 2.1.23) +Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libyaz3-dev (>= 2.1.50) -Package: libyazpp1 +Package: libyazpp2 Section: libs Architecture: any -Depends: ${shlibs:Depends}, libyaz (>= 2.1.14) +Depends: ${shlibs:Depends} Description: YAZ++ and ZOOM library YAZ++ is a C++ library with an object oriented interface to YAZ and ZOOM. -Package: libyazpp-dev +Package: libyazpp2-dev Section: devel Architecture: any -Depends: libyazpp1 (= ${Source-Version}), libyaz-dev +Conflicts: libyazpp-dev +Depends: libyazpp2 (= ${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/libyazpp-dev.install b/debian/libyazpp-dev.install deleted file mode 100644 index 2736f25..0000000 --- a/debian/libyazpp-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/libyazpp1.install b/debian/libyazpp1.install deleted file mode 100644 index 0f88fb3..0000000 --- a/debian/libyazpp1.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libyazpp*.so.* -debian/tmp/usr/lib/libzoompp*.so.* diff --git a/debian/libyazpp1.postinst b/debian/libyazpp1.postinst deleted file mode 100755 index ee8321c..0000000 --- a/debian/libyazpp1.postinst +++ /dev/null @@ -1,45 +0,0 @@ -#! /bin/sh -# postinst script for tklite -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - ldconfig - exit 0 - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - exit 0 - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# diff --git a/debian/libyazpp2-dev.install b/debian/libyazpp2-dev.install new file mode 100644 index 0000000..2736f25 --- /dev/null +++ b/debian/libyazpp2-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/libyazpp2.install b/debian/libyazpp2.install new file mode 100644 index 0000000..0f88fb3 --- /dev/null +++ b/debian/libyazpp2.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 938f20c..50f4371 100755 --- a/debian/rules +++ b/debian/rules @@ -108,9 +108,9 @@ binary-arch: build install dh_fixperms # dh_perl # dh_python - dh_makeshlibs -V 'libyazpp1 (>= 1.0.1)' + dh_makeshlibs -V 'libyazpp2 (>= 1.0.2)' dh_installdeb - dh_shlibdeps -l debian/libyazpp1/usr/lib + dh_shlibdeps -l debian/libyazpp2/usr/lib dh_gencontrol dh_md5sums dh_builddeb diff --git a/src/Makefile.am b/src/Makefile.am index 1d05bf8..ad8b60f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.32 2006-04-20 11:26:34 adam Exp $ +## $Id: Makefile.am,v 1.33 2007-03-20 16:21:58 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 1:0:0 +libyazpp_la_LDFLAGS=-version-info 2:0:0 DISTCLEANFILES = yazpp-config diff --git a/zoom/Makefile.am b/zoom/Makefile.am index 151a66b..3e37994 100644 --- a/zoom/Makefile.am +++ b/zoom/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.13 2006-03-29 13:14:20 adam Exp $ +# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.14 2007-03-20 16:21:58 adam Exp $ AM_CXXFLAGS= $(YAZINC) @@ -7,7 +7,7 @@ lib_LTLIBRARIES = libzoompp.la noinst_PROGRAMS = zclient endif -libzoompp_la_LDFLAGS=-version-info 1:0:0 +libzoompp_la_LDFLAGS=-version-info 2:0:0 LDADD=libzoompp.la $(YAZLALIB) mirk_sources = zexcept.cpp zconn.cpp zquery.cpp zrs.cpp zrec.cpp -- 1.7.10.4