From d201492ea7198dd89dbae087eec0363a8e64e089 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 21 Jul 2011 13:49:13 +0200 Subject: [PATCH 1/1] Bump metaproxy library from 3 to 4 --- NEWS | 3 +++ debian/control | 8 ++++---- debian/libmetaproxy3-dev.install | 4 ---- debian/libmetaproxy3.dirs | 1 - debian/libmetaproxy3.install | 1 - debian/libmetaproxy4-dev.install | 4 ++++ debian/libmetaproxy4.dirs | 1 + debian/libmetaproxy4.install | 1 + debian/rules | 4 ++-- metaproxy.spec | 19 ++++++++++--------- src/Makefile.am | 2 +- 11 files changed, 26 insertions(+), 22 deletions(-) delete mode 100644 debian/libmetaproxy3-dev.install delete mode 100644 debian/libmetaproxy3.dirs delete mode 100644 debian/libmetaproxy3.install create mode 100644 debian/libmetaproxy4-dev.install create mode 100644 debian/libmetaproxy4.dirs create mode 100644 debian/libmetaproxy4.install diff --git a/NEWS b/NEWS index 41a3880..7b62683 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Change major version of metaproxy library from 3 to 4. This in turn +makes new package names for Debian and RPM. + --- 1.2.9 2011/06/27 zoom: enable marc-8 encoding by default for usmarc and opac (in pz2 diff --git a/debian/control b/debian/control index 07f6465..8a44412 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Description: Z39.50/SRU router (main executable) . This package includes the main Metaproxy executable. -Package: libmetaproxy3 +Package: libmetaproxy4 Section: libs Architecture: any Depends: ${shlibs:Depends} @@ -38,16 +38,16 @@ Description: Metaproxy Z39.50/SRU router (main executable) . This package includes the Metaproxy libraries. -Package: libmetaproxy3-dev +Package: libmetaproxy4-dev Section: libdevel Architecture: any -Depends: libmetaproxy3 (= ${Source-Version}), +Depends: libmetaproxy4 (= ${Source-Version}), libyazpp4-dev (>= 1.2.0), libxslt1-dev, libboost-dev, libboost-thread-dev, libgnutls-dev -Conflicts: libmetaproxy2-dev +Conflicts: libmetaproxy2-dev, libmetaproxy3-dev Description: Metaproxy Z39.50/SRU router (main executable) This is a universal router, proxy and encapsulated metasearcher for information retrieval protocols. It accepts, processes, interprets diff --git a/debian/libmetaproxy3-dev.install b/debian/libmetaproxy3-dev.install deleted file mode 100644 index e272241..0000000 --- a/debian/libmetaproxy3-dev.install +++ /dev/null @@ -1,4 +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 diff --git a/debian/libmetaproxy3.dirs b/debian/libmetaproxy3.dirs deleted file mode 100644 index d122cdb..0000000 --- a/debian/libmetaproxy3.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/metaproxy/modules diff --git a/debian/libmetaproxy3.install b/debian/libmetaproxy3.install deleted file mode 100644 index 61f9377..0000000 --- a/debian/libmetaproxy3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libmetaproxy*.so.* diff --git a/debian/libmetaproxy4-dev.install b/debian/libmetaproxy4-dev.install new file mode 100644 index 0000000..e272241 --- /dev/null +++ b/debian/libmetaproxy4-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/metaproxy +debian/tmp/usr/lib/libmetaproxy*.a +debian/tmp/usr/lib/libmetaproxy*.so +debian/tmp/usr/bin/metaproxy-config diff --git a/debian/libmetaproxy4.dirs b/debian/libmetaproxy4.dirs new file mode 100644 index 0000000..d122cdb --- /dev/null +++ b/debian/libmetaproxy4.dirs @@ -0,0 +1 @@ +/usr/lib/metaproxy/modules diff --git a/debian/libmetaproxy4.install b/debian/libmetaproxy4.install new file mode 100644 index 0000000..61f9377 --- /dev/null +++ b/debian/libmetaproxy4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libmetaproxy*.so.* diff --git a/debian/rules b/debian/rules index ab1ad37..66682a3 100755 --- a/debian/rules +++ b/debian/rules @@ -101,9 +101,9 @@ binary-arch: build install dh_fixperms # dh_perl # dh_python - dh_makeshlibs -V 'libmetaproxy3 (>= 1.1.7)' + dh_makeshlibs -V 'libmetaproxy4 (>= 1.2.9)' dh_installdeb - dh_shlibdeps -l debian/libmetaproxy3/usr/lib + dh_shlibdeps -l debian/libmetaproxy4/usr/lib dh_gencontrol dh_md5sums dh_builddeb diff --git a/metaproxy.spec b/metaproxy.spec index f11b74a..1f05bb7 100644 --- a/metaproxy.spec +++ b/metaproxy.spec @@ -25,20 +25,21 @@ Group: Documentation %description doc Metaproxy documentation. -%package -n libmetaproxy3 +%package -n libmetaproxy4 Summary: Metaproxy library Group: Libraries Requires: libyazpp4 -%description -n libmetaproxy3 +%description -n libmetaproxy4 The Metaproxy libraries. -%package -n libmetaproxy3-devel +%package -n libmetaproxy4-devel Summary: Metaproxy development package Group: Development/Libraries -Requires: libmetaproxy3 = %{version}, libyazpp4-devel, boost-devel +Requires: libmetaproxy4 = %{version}, libyazpp4-devel, boost-devel +Conflicts: libmetaproxy3-devel -%description -n libmetaproxy3-devel +%description -n libmetaproxy4-devel Development libraries and include files for the Metaproxy package. %prep @@ -72,17 +73,17 @@ install -m 644 rpm/metaproxy.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/metapr %clean rm -fr ${RPM_BUILD_ROOT} -%files -n libmetaproxy3 +%files -n libmetaproxy4 %doc README LICENSE NEWS %defattr(-,root,root) %{_libdir}/*.so.* %dir %{_libdir}/metaproxy/modules -%post -n libmetaproxy3 -p /sbin/ldconfig +%post -n libmetaproxy4 -p /sbin/ldconfig -%postun -n libmetaproxy3 -p /sbin/ldconfig +%postun -n libmetaproxy4 -p /sbin/ldconfig -%files -n libmetaproxy3-devel +%files -n libmetaproxy4-devel %defattr(-,root,root) %{_includedir}/metaproxy %{_libdir}/*.so diff --git a/src/Makefile.am b/src/Makefile.am index 7972352..c2fe706 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ bin_SCRIPTS = metaproxy-config # Rules for the library.. lib_LTLIBRARIES = libmetaproxy.la -libmetaproxy_la_LDFLAGS = -version-info 3:0:0 -export-dynamic +libmetaproxy_la_LDFLAGS = -version-info 4:0:0 -export-dynamic libmetaproxy_la_SOURCES = \ factory_filter.cpp factory_filter.hpp \ -- 1.7.10.4