From 60cb8a0ce1d85977c7d136d556e711c74e110ede Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 2 Oct 2013 11:21:53 +0200 Subject: [PATCH] Use libyazpp6, libyaz5 and provide libmetaproxy5 --- debian/control | 22 +++++++++++----------- debian/libmetaproxy4-dev.install | 5 ----- debian/libmetaproxy4.dirs | 1 - debian/libmetaproxy4.install | 1 - debian/libmetaproxy5-dev.install | 5 +++++ debian/libmetaproxy5.dirs | 1 + debian/libmetaproxy5.install | 1 + debian/rules | 4 ++-- metaproxy.spec | 24 ++++++++++++------------ src/Makefile.am | 24 ++++++++++++------------ 10 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 debian/libmetaproxy4-dev.install delete mode 100644 debian/libmetaproxy4.dirs delete mode 100644 debian/libmetaproxy4.install create mode 100644 debian/libmetaproxy5-dev.install create mode 100644 debian/libmetaproxy5.dirs create mode 100644 debian/libmetaproxy5.install diff --git a/debian/control b/debian/control index de972fa..2169bf4 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,8 @@ Standards-Version: 3.6.2 Maintainer: Adam Dickmeiss Priority: extra Build-Depends: debhelper (>= 7), - libyaz4-dev (>= 4.2.69), - libyazpp5-dev (>= 1.4.1), + libyaz5-dev (>= 4.2.69), + libyazpp6-dev (>= 1.4.1), libxslt1-dev, libboost-dev, libboost-system-dev, @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 7), Package: metaproxy Section: net Architecture: any -Depends: ${shlibs:Depends}, libmetaproxy4 (= ${Source-Version}) +Depends: ${shlibs:Depends}, libmetaproxy5 (= ${Source-Version}) Conflicts: cf-engine (<= 2.12.5) Description: Z39.50/SRU router (main executable) This is a universal router, proxy and encapsulated metasearcher @@ -27,7 +27,7 @@ Description: Z39.50/SRU router (main executable) . This package includes the main Metaproxy executable. -Package: libmetaproxy4 +Package: libmetaproxy5 Section: libs Architecture: any Depends: ${shlibs:Depends} @@ -40,24 +40,24 @@ Description: Z39.50/SRU router (runtime) . This package includes the Metaproxy libraries. -Package: libmetaproxy4-dbg +Package: libmetaproxy5-dbg Section: debug Architecture: any -Depends: libmetaproxy4 (= ${binary:Version}), ${misc:Depends} -Description: debugging symbols for libmetaproxy4 +Depends: libmetaproxy5 (= ${binary:Version}), ${misc:Depends} +Description: debugging symbols for libmetaproxy5 This is a universal router, proxy and encapsulated metasearcher for information retrieval protocols. It accepts, processes, interprets and redirects requests from IR clients using standard protocols such as the binary ANSI/NISO Z39.50 and the information search and retrieval web service SRU as well as functioning as a limited HTTP server. . - This package contains the debugging symbols for libmetaproxy4. + This package contains the debugging symbols for libmetaproxy5. -Package: libmetaproxy4-dev +Package: libmetaproxy5-dev Section: libdevel Architecture: any -Depends: libmetaproxy4 (= ${Source-Version}), - libyazpp5-dev (>= 1.4.0), +Depends: libmetaproxy5 (= ${Source-Version}), + libyazpp6-dev (>= 1.4.1), libxslt1-dev, libboost-dev, libboost-thread-dev, diff --git a/debian/libmetaproxy4-dev.install b/debian/libmetaproxy4-dev.install deleted file mode 100644 index 8c4e299..0000000 --- a/debian/libmetaproxy4-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -debian/tmp/usr/include/metaproxy -debian/tmp/usr/lib/libmetaproxy*.a -debian/tmp/usr/lib/libmetaproxy*.so -debian/tmp/usr/bin/metaproxy-config -debian/tmp/usr/share/man/man1/metaproxy-config.1 diff --git a/debian/libmetaproxy4.dirs b/debian/libmetaproxy4.dirs deleted file mode 100644 index d41b456..0000000 --- a/debian/libmetaproxy4.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/metaproxy4/modules diff --git a/debian/libmetaproxy4.install b/debian/libmetaproxy4.install deleted file mode 100644 index 61f9377..0000000 --- a/debian/libmetaproxy4.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libmetaproxy*.so.* diff --git a/debian/libmetaproxy5-dev.install b/debian/libmetaproxy5-dev.install new file mode 100644 index 0000000..8c4e299 --- /dev/null +++ b/debian/libmetaproxy5-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/metaproxy +debian/tmp/usr/lib/libmetaproxy*.a +debian/tmp/usr/lib/libmetaproxy*.so +debian/tmp/usr/bin/metaproxy-config +debian/tmp/usr/share/man/man1/metaproxy-config.1 diff --git a/debian/libmetaproxy5.dirs b/debian/libmetaproxy5.dirs new file mode 100644 index 0000000..d41b456 --- /dev/null +++ b/debian/libmetaproxy5.dirs @@ -0,0 +1 @@ +/usr/lib/metaproxy4/modules diff --git a/debian/libmetaproxy5.install b/debian/libmetaproxy5.install new file mode 100644 index 0000000..61f9377 --- /dev/null +++ b/debian/libmetaproxy5.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libmetaproxy*.so.* diff --git a/debian/rules b/debian/rules index abd722e..8e7ccf8 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ override_dh_auto_configure: dh_auto_configure -- --with-yazpp=/usr/bin --without-usemarcon override_dh_strip: - dh_strip --dbg-package=libmetaproxy4-dbg + dh_strip --dbg-package=libmetaproxy5-dbg override_dh_auto_install: dh_auto_install @@ -18,7 +18,7 @@ override_dh_auto_install: cp rpm/metaproxy.user debian/tmp/etc/metaproxy/metaproxy.user override_dh_makeshlibs: - dh_makeshlibs -V 'libmetaproxy4 (>= 1.3.28)' + dh_makeshlibs -V 'libmetaproxy5 (>= 1.3.28)' override_dh_installchangelogs: dh_installchangelogs NEWS diff --git a/metaproxy.spec b/metaproxy.spec index 5dff7a9..00e63a7 100644 --- a/metaproxy.spec +++ b/metaproxy.spec @@ -9,13 +9,13 @@ Vendor: Index Data ApS Source: metaproxy-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root Prefix: %{_prefix} /etc/metaproxy -BuildRequires: pkgconfig, libyaz4-devel >= 4.2.69, libyazpp5-devel >= 1.4.1 +BuildRequires: pkgconfig, libyaz5-devel >= 5.0.0, libyazpp6-devel >= 1.4.1 BuildRequires: libxslt-devel, boost-devel Conflicts: cf-engine <= 2.12.5 Packager: Adam Dickmeiss URL: http://www.indexdata.com/metaproxy Group: Applications/Internet -Requires: libmetaproxy4 = %{version} +Requires: libmetaproxy5 = %{version} %description Metaproxy daemon. @@ -27,21 +27,21 @@ Group: Documentation %description doc Metaproxy documentation. -%package -n libmetaproxy4 +%package -n libmetaproxy5 Summary: Metaproxy library Group: Libraries -Requires: libyazpp5 >= 1.4.0, libyaz4 >= 4.2.69 +Requires: libyazpp6 >= 1.4.1, libyaz4 >= 5.0.0 -%description -n libmetaproxy4 +%description -n libmetaproxy5 The Metaproxy libraries. -%package -n libmetaproxy4-devel +%package -n libmetaproxy5-devel Summary: Metaproxy development package Group: Development/Libraries -Requires: libmetaproxy4 = %{version}, libyazpp5-devel, boost-devel +Requires: libmetaproxy5 = %{version}, libyazpp5-devel, boost-devel Conflicts: libmetaproxy3-devel -%description -n libmetaproxy4-devel +%description -n libmetaproxy5-devel Development libraries and include files for the Metaproxy package. %prep @@ -77,17 +77,17 @@ install -m 644 rpm/metaproxy.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/metapr %clean rm -fr ${RPM_BUILD_ROOT} -%files -n libmetaproxy4 +%files -n libmetaproxy5 %doc README LICENSE NEWS %defattr(-,root,root) %{_libdir}/*.so.* %dir %{_libdir}/metaproxy4/modules -%post -n libmetaproxy4 -p /sbin/ldconfig +%post -n libmetaproxy5 -p /sbin/ldconfig -%postun -n libmetaproxy4 -p /sbin/ldconfig +%postun -n libmetaproxy5 -p /sbin/ldconfig -%files -n libmetaproxy4-devel +%files -n libmetaproxy5-devel %defattr(-,root,root) %{_includedir}/metaproxy %{_libdir}/*.so diff --git a/src/Makefile.am b/src/Makefile.am index 20ed9be..f4edb3c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,7 +40,7 @@ filter_src = \ filter_zoom.cpp filter_zoom.hpp lib_LTLIBRARIES = libmetaproxy.la -libmetaproxy_la_LDFLAGS = -version-info 4:0:0 -export-dynamic +libmetaproxy_la_LDFLAGS = -version-info 5:0:0 -export-dynamic libmetaproxy_la_SOURCES = \ $(filter_src) \ @@ -127,28 +127,28 @@ test_session1_SOURCES=test_session1.cpp test_session2_SOURCES=test_session2.cpp test_boost_threads_SOURCES=test_boost_threads.cpp test_thread_pool_observer_SOURCES = test_thread_pool_observer.cpp -test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp -test_filter_factory_SOURCES = test_filter_factory.cpp -test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp -test_filter_log_SOURCES = test_filter_log.cpp -test_filter_multi_SOURCES = test_filter_multi.cpp +test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp +test_filter_factory_SOURCES = test_filter_factory.cpp +test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp +test_filter_log_SOURCES = test_filter_log.cpp +test_filter_multi_SOURCES = test_filter_multi.cpp test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp test_filter_backend_test_SOURCES = test_filter_backend_test.cpp test_filter_bounce_SOURCES = test_filter_bounce.cpp -test_filter_record_transform_SOURCES = test_filter_record_transform.cpp +test_filter_record_transform_SOURCES = test_filter_record_transform.cpp test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp -test_filter_virt_db_SOURCES = test_filter_virt_db.cpp +test_filter_virt_db_SOURCES = test_filter_virt_db.cpp test_ses_map_SOURCES = test_ses_map.cpp test_router_flexml_SOURCES = test_router_flexml.cpp test_xmlutil_SOURCES = test_xmlutil.cpp -test_html_parser_SOURCES = test_html_parser.cpp -test_filter_rewrite_SOURCES = test_filter_rewrite.cpp +test_html_parser_SOURCES = test_html_parser.cpp +test_filter_rewrite_SOURCES = test_filter_rewrite.cpp # doxygen target dox: - (cd $(top_srcdir) ; make dox) + (cd $(top_srcdir) ; make dox) showdox: - (cd $(top_srcdir) ; make showdox) + (cd $(top_srcdir) ; make showdox) -- 1.7.10.4