From e580f93bef798fb5728d4f019bcda0ef02a7685a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 2 Nov 2022 19:31:27 +0100 Subject: [PATCH] MT#55817 Relocate klish shared libraries and plugins to /usr/lib/klish This is the expected location where lintian will allow such shared private objects, to denote they are internal to this package. This works because the programs and shared libraries get a DT_RUNPATH which affects the dlopen() calls from within and clish uses relative pathnames to load the plugins. Change-Id: I503dac4fd7e93584e414d990a5898cc4499b7a76 --- debian/klish-dev.dirs | 2 +- debian/klish-dev.install | 4 ++-- debian/klish.dirs | 2 +- debian/klish.install | 4 ++-- debian/not-installed | 6 +++--- debian/rules | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/klish-dev.dirs b/debian/klish-dev.dirs index 1dbd46b..e0e8587 100644 --- a/debian/klish-dev.dirs +++ b/debian/klish-dev.dirs @@ -1,2 +1,2 @@ usr/include/clish -usr/lib/clish +usr/lib/klish diff --git a/debian/klish-dev.install b/debian/klish-dev.install index af16041..73f7de0 100644 --- a/debian/klish-dev.install +++ b/debian/klish-dev.install @@ -1,3 +1,3 @@ usr/include/* -usr/lib/clish/lib*.a -usr/lib/clish/lib*.so +usr/lib/klish/lib*.a +usr/lib/klish/lib*.so diff --git a/debian/klish.dirs b/debian/klish.dirs index 422e941..6770b04 100644 --- a/debian/klish.dirs +++ b/debian/klish.dirs @@ -1 +1 @@ -/usr/lib/clish +/usr/lib/klish diff --git a/debian/klish.install b/debian/klish.install index e363c43..834818c 100644 --- a/debian/klish.install +++ b/debian/klish.install @@ -1,3 +1,3 @@ usr/bin/* -usr/lib/clish/*.so.* -usr/lib/clish/clish_plugin*.so +usr/lib/klish/*.so.* +usr/lib/klish/clish_plugin*.so diff --git a/debian/not-installed b/debian/not-installed index 61578f5..cd8146a 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,3 +1,3 @@ -usr/lib/clish/*.la -usr/lib/clish/clish_plugin_clish.a -usr/lib/clish/clish_plugin_lua.a +usr/lib/klish/*.la +usr/lib/klish/clish_plugin_clish.a +usr/lib/klish/clish_plugin_lua.a diff --git a/debian/rules b/debian/rules index 3fb28ef..024ec3f 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ dh $@ override_dh_auto_configure: - ./configure --prefix=/usr --libdir=/usr/lib/clish \ + ./configure --prefix=/usr --libdir=/usr/lib/klish \ --includedir=/usr/include/clish --with-lua override_dh_installsystemd: