From e20fede4d156c8b026faa120e662bef711e6d4d3 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Sun, 10 Jul 2022 11:46:19 +0200 Subject: [PATCH] debian/rules: Fix links to the shared libraries for the -dev packages --- debian/changelog | 3 ++- debian/libnutclient-dev.install | 4 ++-- debian/rules | 11 ++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2e8d2e6..a84e9a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,8 +27,9 @@ nut (2.8.0-1) UNRELEASED; urgency=medium * debian/nut-server.lintian-overrides: Update to properly override udev-rule-missing-subsystem * debian/rules: Build the package in parallel + * debian/rules: Fix links to the shared libraries for the -dev packages - -- Laurent Bigonville Sun, 10 Jul 2022 11:28:35 +0200 + -- Laurent Bigonville Sun, 10 Jul 2022 11:54:59 +0200 nut (2.7.4-14) unstable; urgency=medium diff --git a/debian/libnutclient-dev.install b/debian/libnutclient-dev.install index 25c05f7..e60e38e 100644 --- a/debian/libnutclient-dev.install +++ b/debian/libnutclient-dev.install @@ -5,5 +5,5 @@ usr/lib/*/libnutclient.a usr/lib/*/libnutclient.so usr/lib/*/pkgconfig/libnutclient.pc usr/lib/*/pkgconfig/libnutclientstub.pc -lib/*/libnutclientstub.a -lib/*/libnutclientstub.so +usr/lib/*/libnutclientstub.a +usr/lib/*/libnutclientstub.so diff --git a/debian/rules b/debian/rules index 085a4c9..89fd956 100755 --- a/debian/rules +++ b/debian/rules @@ -76,16 +76,21 @@ override_dh_auto_install-arch: mv $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libupsclient.a \ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.a rm -f $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so - ln -s /lib/$(DEB_HOST_MULTIARCH)/libupsclient.so.4 \ + ln -s /lib/$(DEB_HOST_MULTIARCH)/libupsclient.so.6 \ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so mv $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libnutclient.a \ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnutclient.a rm -f $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libnutclient.so - ln -s /lib/$(DEB_HOST_MULTIARCH)/libnutclient.so.0 \ + ln -s /lib/$(DEB_HOST_MULTIARCH)/libnutclient.so.2 \ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnutclient.so + mv $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libnutclientstub.a \ + $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnutclientstub.a + rm -f $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libnutclientstub.so + ln -s /lib/$(DEB_HOST_MULTIARCH)/libnutclientstub.so.1 \ + $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnutclientstub.so rm -f $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libnutscan.so - ln -s /lib/$(DEB_HOST_MULTIARCH)/libnutscan.so.1 \ + ln -s /lib/$(DEB_HOST_MULTIARCH)/libnutscan.so.2 \ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnutscan.so # Move daemons and install wrappers