user [email protected] usertags -1 + dep17m2 thanks On Tue, Nov 14, 2023 at 12:52:39PM +0100, Helmut Grohne wrote: > Hence, we are good to go. I do not expect libcap-ng to be uploaded to > bookworm-backports and therefore changed the paths directly in the > attached patch. This patch should not be uploaded to bookworm-backports. > If that's relevant to you, consider using dh_movetousr instead. Also > keep in mind that restructuring changes (such as libcap-ng0t64) should > be uploaded to experimental first to let dumat analyze your change for > possible problems.
I'm sorry. Further testing has revealed that I failed to remove the /lib directory from the package. We really need to get rid of it, because dpkg is not equipped to deal with symlink vs directory conflicts. Here is an updated patch. Helmut
diff --minimal -Nru libcap-ng-0.8.3/debian/changelog libcap-ng-0.8.3/debian/changelog --- libcap-ng-0.8.3/debian/changelog 2022-06-23 07:22:33.000000000 +0200 +++ libcap-ng-0.8.3/debian/changelog 2023-11-14 19:31:43.000000000 +0100 @@ -1,3 +1,10 @@ +libcap-ng (0.8.3-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Move libraries to /usr. Closes: #947323 + + -- Helmut Grohne <[email protected]> Tue, 14 Nov 2023 19:31:43 +0100 + libcap-ng (0.8.3-1) unstable; urgency=medium * New upstream release. Closes: #1004519 diff --minimal -Nru libcap-ng-0.8.3/debian/libcap-ng0.dirs libcap-ng-0.8.3/debian/libcap-ng0.dirs --- libcap-ng-0.8.3/debian/libcap-ng0.dirs 2022-06-23 07:22:33.000000000 +0200 +++ libcap-ng-0.8.3/debian/libcap-ng0.dirs 2023-11-14 19:31:37.000000000 +0100 @@ -1,2 +1 @@ -lib usr/lib diff --minimal -Nru libcap-ng-0.8.3/debian/libcap-ng0.install libcap-ng-0.8.3/debian/libcap-ng0.install --- libcap-ng-0.8.3/debian/libcap-ng0.install 2022-06-23 07:22:33.000000000 +0200 +++ libcap-ng-0.8.3/debian/libcap-ng0.install 2023-11-14 19:31:24.000000000 +0100 @@ -1 +1 @@ -lib/*/lib*.so.* +usr/lib/*/lib*.so.* diff --minimal -Nru libcap-ng-0.8.3/debian/rules libcap-ng-0.8.3/debian/rules --- libcap-ng-0.8.3/debian/rules 2022-06-23 07:22:33.000000000 +0200 +++ libcap-ng-0.8.3/debian/rules 2023-11-14 19:31:24.000000000 +0100 @@ -34,12 +34,6 @@ done find $(CURDIR)/debian/tmp -name *.la -delete - mkdir -p $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH) && \ - mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so.0* $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/; \ - rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcap-ng.so; \ - ln -s ../../../lib/$(DEB_HOST_MULTIARCH)/libcap-ng.so.0.0.0 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcap-ng.so; \ - rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdrop_ambient.so; \ - ln -s ../../../lib/$(DEB_HOST_MULTIARCH)/libdrop_ambient.so.0.0.0 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdrop_ambient.so; \ override_dh_auto_test: for V in $(PY3VERS); do \
