Update lib version for metaproxy from 5 to 6 MP-506

diff --git a/debian/.gitignore b/debian/.gitignore
index b227b2f..bbb42ae 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,7 +1,7 @@
 files
-libmetaproxy5
-libmetaproxy5-dbg
-libmetaproxy5-dev
+libmetaproxy6
+libmetaproxy6-dbg
+libmetaproxy6-dev
 metaproxy
 metaproxy-doc
 tmp

diff --git a/debian/control b/debian/control
index 9005771..792b477 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 7),
 Package: metaproxy
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, libmetaproxy5 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libmetaproxy6 (= ${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: libmetaproxy5
+Package: libmetaproxy6
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -40,23 +40,25 @@ Description: Z39.50/SRU router (runtime)
  .
  This package includes the Metaproxy libraries.
 
-Package: libmetaproxy5-dbg
+Package: libmetaproxy6-dbg
 Section: debug
 Architecture: any
-Depends: libmetaproxy5 (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for libmetaproxy5
+Depends: libmetaproxy6 (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for libmetaproxy6
  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 libmetaproxy5.
+ This package contains the debugging symbols for libmetaproxy6.
 
-Package: libmetaproxy5-dev
+Package: libmetaproxy6-dev
 Section: libdevel
 Architecture: any
-Depends: libmetaproxy5 (= ${Source-Version}),
+Provides: libmetaproxy-dev
+Replaces: libmetaproxy-dev
+Depends: libmetaproxy6 (= ${Source-Version}),
        libyazpp6-dev (>= 1.5.2),
        libxslt1-dev,
        libboost-dev,
@@ -64,7 +66,9 @@ Depends: libmetaproxy5 (= ${Source-Version}),
        libboost-regex-dev,
        libboost-system-dev,
        libgnutls-dev
-Conflicts: libmetaproxy2-dev, libmetaproxy3-dev
+Conflicts: libmetaproxy-dev,
+          libmetaproxy2-dev, libmetaproxy3-dev,
+          libmetaproxy4-dev, libmetaproxy5-dev
 Description: Z39.50/SRU router (development)
  This is a universal router, proxy and encapsulated metasearcher
  for information retrieval protocols. It accepts, processes, interprets

diff --git a/debian/libmetaproxy5-dev.install b/debian/libmetaproxy5-dev.install
deleted file mode 100644 (file)
index 8c4e299..0000000
--- a/debian/libmetaproxy5-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/libmetaproxy5.dirs b/debian/libmetaproxy5.dirs
deleted file mode 100644 (file)
index d41b456..0000000
--- a/debian/libmetaproxy5.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/metaproxy4/modules

diff --git a/debian/libmetaproxy5.install b/debian/libmetaproxy5.install
deleted file mode 100644 (file)
index 61f9377..0000000
--- a/debian/libmetaproxy5.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libmetaproxy*.so.*

diff --git a/debian/libmetaproxy6-dev.install b/debian/libmetaproxy6-dev.install
new file mode 100644 (file)
index 0000000..8c4e299
--- /dev/null
+++ b/debian/libmetaproxy6-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/libmetaproxy6.dirs b/debian/libmetaproxy6.dirs
new file mode 100644 (file)
index 0000000..1678267
--- /dev/null
+++ b/debian/libmetaproxy6.dirs
@@ -0,0 +1 @@
+/usr/lib/metaproxy6/modules

diff --git a/debian/libmetaproxy6.install b/debian/libmetaproxy6.install
new file mode 100644 (file)
index 0000000..61f9377
--- /dev/null
+++ b/debian/libmetaproxy6.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libmetaproxy*.so.*

diff --git a/debian/metaproxy.xml b/debian/metaproxy.xml
index 4d21276..45c86a1 100644 (file)
--- a/debian/metaproxy.xml
+++ b/debian/metaproxy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metaproxy xmlns="http://indexdata.com/metaproxy" version="1.0">
-  <dlpath>/usr/lib/metaproxy4/modules</dlpath>
+  <dlpath>/usr/lib/metaproxy6/modules</dlpath>
   <start route="start"/>
   <filters>
     <filter id="frontend" type="frontend_net">

diff --git a/debian/rules b/debian/rules
index 8e7ccf8..be639df 100755 (executable)
--- 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=libmetaproxy5-dbg
+       dh_strip --dbg-package=libmetaproxy6-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 'libmetaproxy5 (>= 1.3.28)'
+       dh_makeshlibs -V 'libmetaproxy6 (>= 1.3.28)'
 
 override_dh_installchangelogs:
        dh_installchangelogs NEWS

diff --git a/doc/metaproxy-config.xml b/doc/metaproxy-config.xml
index ed5fefd..621cbab 100644 (file)
--- a/doc/metaproxy-config.xml
+++ b/doc/metaproxy-config.xml
@@ -98,7 +98,7 @@
    <filename><replaceable>prefix</replaceable>/lib/libmetaproxy*.a</filename>
   </para>
   <para>
-   <filename><replaceable>prefix</replaceable>/lib/metaproxy4/modules</filename>
+   <filename><replaceable>prefix</replaceable>/lib/metaproxy6/modules</filename>
   </para>
   <para>
    <filename><replaceable>prefix</replaceable>/include/metaproxy</filename>

diff --git a/metaproxy.spec b/metaproxy.spec
index 397e855..c1df92f 100644 (file)
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -15,7 +15,7 @@ Conflicts: cf-engine <= 2.12.5
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/metaproxy
 Group:  Applications/Internet
-Requires:  libmetaproxy5 = %{version}
+Requires:  libmetaproxy6 = %{version}
 
 %description
 Metaproxy daemon.
@@ -27,21 +27,21 @@ Group: Documentation
 %description doc
 Metaproxy documentation.
 
-%package -n libmetaproxy5
+%package -n libmetaproxy6
 Summary: Metaproxy library
 Group: Libraries
 Requires: libyazpp6 >= 1.5.2, libyaz5 >= 5.0.0
 
-%description -n libmetaproxy5
+%description -n libmetaproxy6
 The Metaproxy libraries.
 
-%package -n libmetaproxy5-devel
+%package -n libmetaproxy6-devel
 Summary: Metaproxy development package
 Group: Development/Libraries
-Requires: libmetaproxy5 = %{version}, libyazpp6-devel, boost-devel
-Conflicts: libmetaproxy3-devel, libmetaproxy4-devel
+Requires: libmetaproxy6 = %{version}, libyazpp6-devel, boost-devel
+Conflicts: libmetaproxy3-devel, libmetaproxy4-devel, libmetaproxy5-devel
 
-%description -n libmetaproxy5-devel
+%description -n libmetaproxy6-devel
 Development libraries and include files for the Metaproxy package.
 
 %prep
@@ -60,7 +60,7 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la
 rm -fr ${RPM_BUILD_ROOT}/%{_prefix}/share/metaproxy
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy/*
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy4/modules
+mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy6/modules
 mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/filters-enabled
 mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/filters-available
 mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/ports.d
@@ -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 libmetaproxy5
+%files -n libmetaproxy6
 %doc README LICENSE NEWS
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%dir %{_libdir}/metaproxy4/modules
+%dir %{_libdir}/metaproxy6/modules
 
-%post -n libmetaproxy5 -p /sbin/ldconfig
+%post -n libmetaproxy6 -p /sbin/ldconfig
 
-%postun -n libmetaproxy5 -p /sbin/ldconfig
+%postun -n libmetaproxy6 -p /sbin/ldconfig
 
-%files -n libmetaproxy5-devel
+%files -n libmetaproxy6-devel
 %defattr(-,root,root)
 %{_includedir}/metaproxy
 %{_libdir}/*.so

diff --git a/rpm/metaproxy.xml b/rpm/metaproxy.xml
index e3ca70a..3e50c13 100644 (file)
--- a/rpm/metaproxy.xml
+++ b/rpm/metaproxy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metaproxy xmlns="http://indexdata.com/metaproxy" version="1.0">
-  <dlpath>/usr/lib64/metaproxy4/modules</dlpath>
+  <dlpath>/usr/lib64/metaproxy6/modules</dlpath>
   <start route="start"/>
   <filters>
     <filter id="frontend" type="frontend_net">

diff --git a/src/Makefile.am b/src/Makefile.am
index 20fedca..9f7bb09 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,7 @@ filter_src = \
        filter_zoom.cpp filter_zoom.hpp
 
 lib_LTLIBRARIES = libmetaproxy.la
-libmetaproxy_la_LDFLAGS = -version-info 5:0:0 -export-dynamic
+libmetaproxy_la_LDFLAGS = -version-info 6:0:0 -export-dynamic
 
 libmetaproxy_la_SOURCES = \
        $(filter_src) \