From 059d1ebe37f4c1ab1496d8c68db5ac35d9047c7a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 1 Oct 2013 16:19:34 +0200 Subject: [PATCH] New pkg libyazpp6 using libyaz5 --- debian/control | 10 +++++----- debian/libyazpp5-dev.install | 9 --------- debian/libyazpp5.install | 2 -- debian/libyazpp6-dev.install | 9 +++++++++ debian/libyazpp6.install | 2 ++ debian/rules | 4 ++-- yazpp.spec | 23 ++++++++++++----------- 7 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 debian/libyazpp5-dev.install delete mode 100644 debian/libyazpp5.install create mode 100644 debian/libyazpp6-dev.install create mode 100644 debian/libyazpp6.install diff --git a/debian/control b/debian/control index b33c677..6c3c6df 100644 --- a/debian/control +++ b/debian/control @@ -5,29 +5,29 @@ Maintainer: Adam Dickmeiss Standards-Version: 3.6.2 Build-Depends: debhelper (>= 7), libxml2-dev, libxslt1-dev, - libyaz4-dev (>= 4.2.8) + libyaz5-dev (>= 5.0.0) -Package: libyazpp5 +Package: libyazpp6 Section: libs Architecture: any Depends: ${shlibs:Depends} Description: YAZ++ library YAZ++ is a C++ library with an object oriented interface to YAZ and ZOOM. -Package: libyazpp5-dbg +Package: libyazpp6-dbg Section: debug Architecture: any Depends: ${misc:Depends}, libyazpp5 (= ${Source-Version}) Description: debugging symbols for YAZ++ library YAZ++ is a C++ library with an object oriented interface to YAZ and ZOOM. -Package: libyazpp5-dev +Package: libyazpp6-dev Section: libdevel Architecture: any Conflicts: libyazpp-dev, libyazpp2-dev, libyazpp3-dev, libyazpp4-dev Provides: libyazpp-dev Replaces: libyazpp-dev -Depends: libyazpp5 (= ${Source-Version}), libyaz4-dev +Depends: libyazpp6 (= ${Source-Version}), libyaz5-dev Description: development libraries for YAZ++ YAZ++ is a C++ library with an object oriented interface to YAZ and ZOOM. diff --git a/debian/libyazpp5-dev.install b/debian/libyazpp5-dev.install deleted file mode 100644 index 3b0fa09..0000000 --- a/debian/libyazpp5-dev.install +++ /dev/null @@ -1,9 +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/bin/yazpp-config -debian/tmp/usr/share/aclocal/yazpp.m4 -debian/tmp/usr/share/man/man1/yazpp-config.1 - diff --git a/debian/libyazpp5.install b/debian/libyazpp5.install deleted file mode 100644 index 0f88fb3..0000000 --- a/debian/libyazpp5.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libyazpp*.so.* -debian/tmp/usr/lib/libzoompp*.so.* diff --git a/debian/libyazpp6-dev.install b/debian/libyazpp6-dev.install new file mode 100644 index 0000000..3b0fa09 --- /dev/null +++ b/debian/libyazpp6-dev.install @@ -0,0 +1,9 @@ +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/bin/yazpp-config +debian/tmp/usr/share/aclocal/yazpp.m4 +debian/tmp/usr/share/man/man1/yazpp-config.1 + diff --git a/debian/libyazpp6.install b/debian/libyazpp6.install new file mode 100644 index 0000000..0f88fb3 --- /dev/null +++ b/debian/libyazpp6.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 73308cd..a07e165 100755 --- a/debian/rules +++ b/debian/rules @@ -8,14 +8,14 @@ override_dh_auto_configure: dh_auto_configure -- --with-yaz=/usr/bin override_dh_strip: - dh_strip --dbg-package=libyazpp5-dbg + dh_strip --dbg-package=libyazpp6-dbg override_dh_auto_install: dh_auto_install mv debian/tmp/usr/share/doc/yazpp debian/tmp/usr/share/doc/yazpp-doc override_dh_makeshlibs: - dh_makeshlibs -V 'libyazpp5 (>= 1.4.1)' + dh_makeshlibs -V 'libyazpp6 (>= 1.4.1)' override_dh_installchangelogs: dh_installchangelogs NEWS diff --git a/yazpp.spec b/yazpp.spec index cd813fc..f332644 100644 --- a/yazpp.spec +++ b/yazpp.spec @@ -9,28 +9,29 @@ Vendor: Index Data ApS Source: yazpp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root Prefix: %{_prefix} -BuildRequires: pkgconfig, libyaz4-devel >= 4.2.8 +BuildRequires: pkgconfig, libyaz5-devel >= 5.0.0 Packager: Adam Dickmeiss URL: http://www.indexdata.com/yazplusplus %description YAZ++ package. -%package -n libyazpp5 +%package -n libyazpp6 Summary: YAZ++ and ZOOM library Group: Libraries -Requires: libyaz4 >= 4.2.8 +Requires: libyaz5 >= 5.0.0 -%description -n libyazpp5 +%description -n libyazpp6 Libraries for the YAZ++ package. -%package -n libyazpp5-devel +%package -n libyazpp6-devel Summary: Z39.50 Library - development package Group: Development/Libraries -Requires: libyazpp5 = %{version}, libyaz4-devel +Requires: libyazpp6 = %{version}, libyaz5-devel Conflicts: libyazpp4-devel +Conflicts: libyazpp5-devel -%description -n libyazpp5-devel +%description -n libyazpp6-devel Development libraries and include files for the YAZ++ package. %prep @@ -51,15 +52,15 @@ rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la %clean rm -fr ${RPM_BUILD_ROOT} -%post -n libyazpp5 -p /sbin/ldconfig -%postun -n libyazpp5 -p /sbin/ldconfig +%post -n libyazpp6 -p /sbin/ldconfig +%postun -n libyazpp6 -p /sbin/ldconfig -%files -n libyazpp5 +%files -n libyazpp6 %doc README LICENSE NEWS %defattr(-,root,root) %{_libdir}/*.so.* -%files -n libyazpp5-devel +%files -n libyazpp6-devel %defattr(-,root,root) %{_bindir}/yazpp-config %{_includedir}/yazpp -- 1.7.10.4