From 467c49ed93ecf15f434d28f3b0d3f3bb2949df8b Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 20 Mar 2007 16:23:42 +0000 Subject: [PATCH] Debian packages libyazproxy2, libyazproxy2-dev. These depend on libyazpp2, libyazpp2-dev. Branch out: YAZPROXY_1_2_1_1_branch . --- Makefile.am | 3 +-- NEWS | 5 +++++ configure.ac | 6 +++--- debian/changelog | 6 ++++++ debian/control | 13 +++++------ debian/libyazproxy-dev.install | 4 ---- debian/libyazproxy1.install | 1 - debian/libyazproxy1.postinst | 45 --------------------------------------- debian/libyazproxy2-dev.install | 4 ++++ debian/libyazproxy2.install | 1 + debian/rules | 4 ++-- src/Makefile.am | 4 ++-- 12 files changed, 31 insertions(+), 65 deletions(-) delete mode 100644 debian/libyazproxy-dev.install delete mode 100644 debian/libyazproxy1.install delete mode 100755 debian/libyazproxy1.postinst create mode 100644 debian/libyazproxy2-dev.install create mode 100644 debian/libyazproxy2.install diff --git a/Makefile.am b/Makefile.am index 9d8f4cc..8ba358f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,13 +7,12 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST= README LICENSE m4/yazpp.m4 m4/yaz.m4 m4/usemarcon.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 cp $(srcdir)/debian/*.manpages $(distdir)/debian diff --git a/NEWS b/NEWS index d420cb6..ac06248 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +Debian packages libyazproxy2, libyazproxy2-dev. These depend on +libyazpp2, libyazpp2-dev. + +Branch out: YAZPROXY_1_2_1_1_branch . + --- 1.2.1.1 2006/06/09 Added support for thread config element which specifies number of diff --git a/configure.ac b/configure.ac index f2e25aa..4e75cf1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ -dnl yazproxy, Index Data 1994-2006 +dnl yazproxy, Index Data 1994-2007 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.14 2006-07-07 12:17:00 adam Exp $ +dnl $Id: configure.ac,v 1.15 2007-03-20 16:23:42 adam Exp $ AC_PREREQ(2.59) -AC_INIT([yazproxy],[1.2.1.1],[adam@indexdata.dk]) +AC_INIT([yazproxy],[1.3.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 17cc547..c36ca91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yazproxy (1.3.0-1) unstable; urgency=low + + * Upstream. libyazproxy2. + + -- Adam Dickmeiss Tue, 20 Mar 2007 09:22:01 +0100 + yazproxy (1.2.1-1) unstable; urgency=low * Do not depend on docbook utils. Doc is part of make dist. diff --git a/debian/control b/debian/control index 074089f..c009655 100644 --- a/debian/control +++ b/debian/control @@ -2,32 +2,33 @@ Source: yazproxy Priority: optional Maintainer: Adam Dickmeiss Standards-Version: 3.6.0 -Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libyaz-dev (>= 2.1.23), libyazpp-dev(>= 1.0.1) +Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libyazpp2-dev(>= 1.0.3) Package: yazproxy Section: utils Architecture: any -Depends: libyazproxy1 (= ${Source-Version}) +Depends: ${shlibs:Depends}, libyazproxy2 (= ${Source-Version}) Description: YAZ Proxy. YAZ proxy is a daemon that accepts Z39.50/SRW/SRU incoming requests and converts them to Z39.50 client requests. The proxy has several facilities to optimize performance and tries to reduce the commnication with the backend server. -Package: libyazproxy1 +Package: libyazproxy2 Section: libs Architecture: any -Depends: ${shlibs:Depends}, libyazpp1 (>= 1.0.1) +Depends: ${shlibs:Depends} Description: YAZ Proxy libraries. YAZ proxy is a daemon that accepts Z39.50/SRW/SRU incoming requests and converts them to Z39.50 client requests. The proxy has several facilities to optimize performance and tries to reduce the commnication with the backend server. -Package: libyazproxy-dev +Package: libyazproxy2-dev Section: devel Architecture: any -Depends: libyazproxy1 (= ${Source-Version}), libxml2-dev, libxslt1-dev, libyazpp-dev, libyaz-dev +Depends: libyazproxy2 (= ${Source-Version}), libxml2-dev, libxslt1-dev, libyazpp2-dev +Conflicts: libyazproxy-dev Description: YAZ Proxy development libraries. YAZ proxy is a daemon that accepts Z39.50/SRW/SRU incoming requests and converts them to Z39.50 client requests. The proxy has several facilities diff --git a/debian/libyazproxy-dev.install b/debian/libyazproxy-dev.install deleted file mode 100644 index c67438c..0000000 --- a/debian/libyazproxy-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/include/yazproxy/*.h -debian/tmp/usr/lib/libyazproxy*.a -debian/tmp/usr/lib/libyazproxy*.so -debian/tmp/usr/lib/libyazproxy*.la diff --git a/debian/libyazproxy1.install b/debian/libyazproxy1.install deleted file mode 100644 index 8e814bc..0000000 --- a/debian/libyazproxy1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libyazproxy*.so.* diff --git a/debian/libyazproxy1.postinst b/debian/libyazproxy1.postinst deleted file mode 100755 index b1c9f23..0000000 --- a/debian/libyazproxy1.postinst +++ /dev/null @@ -1,45 +0,0 @@ -#! /bin/sh -# postinst script -# -# 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/libyazproxy2-dev.install b/debian/libyazproxy2-dev.install new file mode 100644 index 0000000..c67438c --- /dev/null +++ b/debian/libyazproxy2-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/yazproxy/*.h +debian/tmp/usr/lib/libyazproxy*.a +debian/tmp/usr/lib/libyazproxy*.so +debian/tmp/usr/lib/libyazproxy*.la diff --git a/debian/libyazproxy2.install b/debian/libyazproxy2.install new file mode 100644 index 0000000..8e814bc --- /dev/null +++ b/debian/libyazproxy2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libyazproxy*.so.* diff --git a/debian/rules b/debian/rules index d07a8d4..5010daf 100755 --- a/debian/rules +++ b/debian/rules @@ -108,9 +108,9 @@ binary-arch: build install dh_fixperms # dh_perl # dh_python - dh_makeshlibs -V 'libyazproxy1 (>= 1.1)' + dh_makeshlibs -V 'libyazproxy2 (>= 1.3.0)' dh_installdeb - dh_shlibdeps -l debian/libyazproxy1/usr/lib + dh_shlibdeps -l debian/libyazproxy2/usr/lib dh_gencontrol dh_md5sums dh_builddeb diff --git a/src/Makefile.am b/src/Makefile.am index 04384b9..d57ae8d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,9 @@ -## $Id: Makefile.am,v 1.15 2007-02-25 17:51:22 adam Exp $ +## $Id: Makefile.am,v 1.16 2007-03-20 16:23:43 adam Exp $ AM_CXXFLAGS = $(YAZPPINC) -I$(srcdir)/../include $(USEMARCONINC) lib_LTLIBRARIES = libyazproxy.la -libyazproxy_la_LDFLAGS=-version-info 1:0:0 +libyazproxy_la_LDFLAGS=-version-info 2:0:0 libyazproxy_la_SOURCES= yaz-proxy.cpp yaz-proxy-config.cpp yaz-bw.cpp \ proxyp.h yaz-usemarcon.cpp charset-converter.cpp msg-thread.cpp msg-thread.h \ -- 1.7.10.4