Source: freebsd-libs
Version: 10.3~svn296373-10
Tags: patch trixie sid
User: helm...@debian.org
Usertags: dep17m2
Hi,
we want to finalize the /usr-merge transition by moving all aliased
files from / to /usr via DEP17 to avoid negative consequences arising
from aliasing effects. Multiple packages from freebsd-libs are involved
as they install shared libraries below /lib. I am sending a patch,
because freebsd-libs cannot be automatically converted using
dh-sequence-movetousr. Note that this patch must not be uploaded to
bookworm-backports or earlier as it would violate the file move
moratorium there. I also did not test this patch on kfreebsd-any. If
possible, please verify that it does not regress kfreebsd-any before
uploading.
Helmut
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/changelog
freebsd-libs-10.3~svn296373/debian/changelog
--- freebsd-libs-10.3~svn296373/debian/changelog 2017-02-03
16:35:02.000000000 +0100
+++ freebsd-libs-10.3~svn296373/debian/changelog 2024-02-11
08:08:32.000000000 +0100
@@ -1,3 +1,10 @@
+freebsd-libs (10.3~svn296373-10.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move all libraries to /usr for DEP17. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 11 Feb 2024 08:08:32 +0100
+
freebsd-libs (10.3~svn296373-10) unstable; urgency=medium
* Pre-define MACHINE_ARCH with the host architecture we are building
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/libgeom1-udeb.install
freebsd-libs-10.3~svn296373/debian/libgeom1-udeb.install
--- freebsd-libs-10.3~svn296373/debian/libgeom1-udeb.install 2014-07-13
22:46:01.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libgeom1-udeb.install 2024-02-11
08:07:36.000000000 +0100
@@ -1 +1 @@
-lib/libgeom*.so.*
+usr/lib/libgeom*.so.*
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/libgeom1.install
freebsd-libs-10.3~svn296373/debian/libgeom1.install
--- freebsd-libs-10.3~svn296373/debian/libgeom1.install 2014-07-13
22:46:02.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libgeom1.install 2024-02-11
08:07:39.000000000 +0100
@@ -1 +1 @@
-lib/libgeom*.so.*
+usr/lib/libgeom*.so.*
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/libipx2-udeb.install
freebsd-libs-10.3~svn296373/debian/libipx2-udeb.install
--- freebsd-libs-10.3~svn296373/debian/libipx2-udeb.install 2014-07-13
22:46:01.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libipx2-udeb.install 2024-02-11
08:07:42.000000000 +0100
@@ -1 +1 @@
-lib/libipx*.so.*
+usr/lib/libipx*.so.*
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/libipx2.install
freebsd-libs-10.3~svn296373/debian/libipx2.install
--- freebsd-libs-10.3~svn296373/debian/libipx2.install 2014-07-13
22:46:02.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libipx2.install 2024-02-11
08:07:45.000000000 +0100
@@ -1 +1 @@
-lib/libipx*.so.*
+usr/lib/libipx*.so.*
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/libjail1.install
freebsd-libs-10.3~svn296373/debian/libjail1.install
--- freebsd-libs-10.3~svn296373/debian/libjail1.install 2014-07-13
22:46:02.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libjail1.install 2024-02-11
08:07:49.000000000 +0100
@@ -1 +1 @@
-lib/libjail*.so.*
+usr/lib/libjail*.so.*
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/libkvm6.install
freebsd-libs-10.3~svn296373/debian/libkvm6.install
--- freebsd-libs-10.3~svn296373/debian/libkvm6.install 2014-09-17
02:37:56.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libkvm6.install 2024-02-11
08:07:55.000000000 +0100
@@ -1 +1 @@
-lib/libkvm*.so.*
+usr/lib/libkvm*.so.*
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/libsbuf6-udeb.install
freebsd-libs-10.3~svn296373/debian/libsbuf6-udeb.install
--- freebsd-libs-10.3~svn296373/debian/libsbuf6-udeb.install 2014-07-13
22:46:02.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libsbuf6-udeb.install 2024-02-11
08:08:03.000000000 +0100
@@ -1 +1 @@
-lib/libsbuf*.so.*
+usr/lib/libsbuf*.so.*
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/libsbuf6.install
freebsd-libs-10.3~svn296373/debian/libsbuf6.install
--- freebsd-libs-10.3~svn296373/debian/libsbuf6.install 2014-07-13
22:46:02.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libsbuf6.install 2024-02-11
08:08:06.000000000 +0100
@@ -1 +1 @@
-lib/libsbuf*.so.*
+usr/lib/libsbuf*.so.*
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/libusb3-udeb.install
freebsd-libs-10.3~svn296373/debian/libusb3-udeb.install
--- freebsd-libs-10.3~svn296373/debian/libusb3-udeb.install 2016-04-20
23:08:43.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libusb3-udeb.install 2024-02-11
08:08:10.000000000 +0100
@@ -1 +1 @@
-lib/*/libusb.so.*
+usr/lib/*/libusb.so.*
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/libusb3.install
freebsd-libs-10.3~svn296373/debian/libusb3.install
--- freebsd-libs-10.3~svn296373/debian/libusb3.install 2016-04-20
23:53:27.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libusb3.install 2024-02-11
08:08:13.000000000 +0100
@@ -1 +1 @@
-lib/*/libusb.so.*
+usr/lib/*/libusb.so.*
diff --minimal -Nru
freebsd-libs-10.3~svn296373/debian/libutil-freebsd-9.install
freebsd-libs-10.3~svn296373/debian/libutil-freebsd-9.install
--- freebsd-libs-10.3~svn296373/debian/libutil-freebsd-9.install
2014-07-13 22:46:02.000000000 +0200
+++ freebsd-libs-10.3~svn296373/debian/libutil-freebsd-9.install
2024-02-11 08:08:19.000000000 +0100
@@ -1 +1 @@
-lib/libutil-freebsd.so.*
+usr/lib/libutil-freebsd.so.*
diff --minimal -Nru freebsd-libs-10.3~svn296373/debian/rules
freebsd-libs-10.3~svn296373/debian/rules
--- freebsd-libs-10.3~svn296373/debian/rules 2017-02-03 16:31:24.000000000
+0100
+++ freebsd-libs-10.3~svn296373/debian/rules 2024-02-11 08:07:20.000000000
+0100
@@ -280,30 +280,30 @@
dh_installdirs -a
mkdir -p \
- $(DESTDIR)/lib \
- $(DESTDIR)/lib/$(DEB_HOST_MULTIARCH) \
+ $(DESTDIR)/usr/lib \
+ $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH) \
$(DESTDIR)/usr/lib \
$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH) \
$(DESTDIR)/usr/lib/pkgconfig \
$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
$(DESTDIR)/usr/include \
$(DESTDIR)/usr/share/man/man3
- $(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/lib
+ $(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libdwarf install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libelf install SHLIBDIR=/usr/lib
- $(PMAKE) -C $(CURDIR)/lib/libutil install SHLIBDIR=/lib
- $(PMAKE) -C $(CURDIR)/lib/libipx install SHLIBDIR=/lib
+ $(PMAKE) -C $(CURDIR)/lib/libutil install SHLIBDIR=/usr/lib
+ $(PMAKE) -C $(CURDIR)/lib/libipx install SHLIBDIR=/usr/lib
ifeq ($(kernel), kfreebsd)
$(PMAKE) -C $(CURDIR)/lib/libcam install SHLIBDIR=/usr/lib
- $(PMAKE) -C $(CURDIR)/lib/libgeom install SHLIBDIR=/lib
+ $(PMAKE) -C $(CURDIR)/lib/libgeom install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libkiconv install SHLIBDIR=/usr/lib
- $(PMAKE) -C $(CURDIR)/lib/libkvm install SHLIBDIR=/lib
+ $(PMAKE) -C $(CURDIR)/lib/libkvm install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libdevstat install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libmemstat install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libnetgraph install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libusbhid install SHLIBDIR=/usr/lib
- $(PMAKE) -C $(CURDIR)/lib/libusb install
SHLIBDIR=/lib/$(DEB_HOST_MULTIARCH) LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
- $(PMAKE) -C $(CURDIR)/lib/libjail install SHLIBDIR=/lib
+ $(PMAKE) -C $(CURDIR)/lib/libusb install
SHLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+ $(PMAKE) -C $(CURDIR)/lib/libjail install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libalias install SHLIBDIR=/usr/lib
mkdir -p $(CURDIR)/debian/tmp/usr/bin
