From e388ba962b0a04fd82de8c49f08a37288c745269 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Mon, 24 Feb 2025 03:30:38 -0600 Subject: [PATCH] Move the unversioned .so files to the individual libraries (LP: #2099870). --- debian/changelog | 6 ++++++ debian/control | 20 ++++++++++---------- debian/libcalamares-dev.install | 3 --- debian/libcalamares3.3.install | 3 ++- debian/libcalamaresui3.3.install | 2 +- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index b164f14..0f16349 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.3.14-0ubuntu4) plucky; urgency=medium + + * Move the unversioned .so files to the individual libraries (LP: #2099870). + + -- Simon Quigley Mon, 24 Feb 2025 03:30:01 -0600 + calamares (3.3.14-0ubuntu3) plucky; urgency=medium * Add validate-unpackfsc-1 to the XFAIL list. diff --git a/debian/control b/debian/control index bcf2d79..0f152e7 100644 --- a/debian/control +++ b/debian/control @@ -62,8 +62,8 @@ Depends: calamares-data (= ${binary:Version}), util-linux-extra, ${misc:Depends}, ${shlibs:Depends} -Breaks: calamares (<< 3.3.14-0ubuntu1) -Replaces: calamares (<< 3.3.14-0ubuntu1) +Breaks: calamares (<< 3.3.14-0ubuntu4) +Replaces: calamares (<< 3.3.14-0ubuntu4) Recommends: btrfs-progs, squashfs-tools Description: distribution-independent installer framework Calamares is a distribution-independent installer framework. @@ -80,8 +80,8 @@ Description: distribution-independent installer framework Package: calamares-data Architecture: all Depends: ${misc:Depends}, ${qml6:Depends} -Breaks: calamares (<< 3.3.14-0ubuntu1) -Replaces: calamares (<< 3.3.14-0ubuntu1) +Breaks: calamares (<< 3.3.14-0ubuntu4) +Replaces: calamares (<< 3.3.14-0ubuntu4) Description: data for Calamares Calamares is a distribution-independent installer framework. . @@ -103,8 +103,8 @@ Depends: libcalamares3.3 (= ${binary:Version}), libcalamaresui3.3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Breaks: calamares (<< 3.3.14-0ubuntu1) -Replaces: calamares (<< 3.3.14-0ubuntu1) +Breaks: calamares (<< 3.3.14-0ubuntu4) +Replaces: calamares (<< 3.3.14-0ubuntu4) Description: Development files for Calamares Calamares is a distribution-independent installer framework. . @@ -124,8 +124,8 @@ Section: libs Architecture: linux-any Provides: libcalamares Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: calamares (<< 3.3.14-0ubuntu1) -Replaces: calamares (<< 3.3.14-0ubuntu1) +Breaks: calamares (<< 3.3.14-0ubuntu4) +Replaces: calamares (<< 3.3.14-0ubuntu4) Description: Shared object files for Calamares Calamares is a distribution-independent installer framework. . @@ -145,8 +145,8 @@ Section: libs Architecture: linux-any Provides: libcalamaresui Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: calamares (<< 3.3.14-0ubuntu1) -Replaces: calamares (<< 3.3.14-0ubuntu1) +Breaks: calamares (<< 3.3.14-0ubuntu4) +Replaces: calamares (<< 3.3.14-0ubuntu4) Description: UI shared object files for Calamares Calamares is a distribution-independent installer framework. . diff --git a/debian/libcalamares-dev.install b/debian/libcalamares-dev.install index 074e7b8..129ba15 100644 --- a/debian/libcalamares-dev.install +++ b/debian/libcalamares-dev.install @@ -1,5 +1,2 @@ /usr/include/libcalamares/ -/usr/lib/${DEB_HOST_MULTIARCH}/calamares/libcalamares.so /usr/lib/${DEB_HOST_MULTIARCH}/cmake/Calamares/ -/usr/lib/${DEB_HOST_MULTIARCH}/libcalamares.so -/usr/lib/${DEB_HOST_MULTIARCH}/libcalamaresui.so diff --git a/debian/libcalamares3.3.install b/debian/libcalamares3.3.install index bf5bcb1..5ceeb3e 100644 --- a/debian/libcalamares3.3.install +++ b/debian/libcalamares3.3.install @@ -1 +1,2 @@ -/usr/lib/${DEB_HOST_MULTIARCH}/libcalamares.so.* +/usr/lib/${DEB_HOST_MULTIARCH}/libcalamares.so* +/usr/lib/${DEB_HOST_MULTIARCH}/calamares/libcalamares.so diff --git a/debian/libcalamaresui3.3.install b/debian/libcalamaresui3.3.install index ff4835e..e6f8e90 100644 --- a/debian/libcalamaresui3.3.install +++ b/debian/libcalamaresui3.3.install @@ -1 +1 @@ -/usr/lib/${DEB_HOST_MULTIARCH}/libcalamaresui.so.* +/usr/lib/${DEB_HOST_MULTIARCH}/libcalamaresui.so*