Package: libfreebsd-glue-0
Version: 0.2.22+nmu1
Tags: patch
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 any negative effects arising
from aliasing. libfreebsd-glue-0 is involved, because it installs a
shared library below /lib and does not use dh, which would allow
converting it automatically. I am attaching a patch to perform the move.
Do not upload this patch to bookworm-backports or earlier as you would
violate the earlier /usr-merge file move moratorium.
Helmut
diff --minimal -Nru freebsd-glue-0.2.22+nmu1/debian/changelog
freebsd-glue-0.2.22+nmu2/debian/changelog
--- freebsd-glue-0.2.22+nmu1/debian/changelog 2023-08-07 01:20:16.000000000
+0200
+++ freebsd-glue-0.2.22+nmu2/debian/changelog 2024-02-09 15:29:32.000000000
+0100
@@ -1,3 +1,10 @@
+freebsd-glue (0.2.22+nmu2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move files to /usr (DEP17). (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 09 Feb 2024 15:29:32 +0100
+
freebsd-glue (0.2.22+nmu1) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru
freebsd-glue-0.2.22+nmu1/debian/libfreebsd-glue-0-udeb.install
freebsd-glue-0.2.22+nmu2/debian/libfreebsd-glue-0-udeb.install
--- freebsd-glue-0.2.22+nmu1/debian/libfreebsd-glue-0-udeb.install
2014-08-25 21:40:16.000000000 +0200
+++ freebsd-glue-0.2.22+nmu2/debian/libfreebsd-glue-0-udeb.install
2024-02-09 15:29:12.000000000 +0100
@@ -1 +1 @@
-debian/tmp-udeb/lib/libfreebsd-glue.so.* lib
+debian/tmp-udeb/usr/lib/libfreebsd-glue.so.* usr/lib
diff --minimal -Nru freebsd-glue-0.2.22+nmu1/debian/libfreebsd-glue-0.install
freebsd-glue-0.2.22+nmu2/debian/libfreebsd-glue-0.install
--- freebsd-glue-0.2.22+nmu1/debian/libfreebsd-glue-0.install 2014-08-25
21:40:16.000000000 +0200
+++ freebsd-glue-0.2.22+nmu2/debian/libfreebsd-glue-0.install 2024-02-09
15:29:15.000000000 +0100
@@ -1 +1 @@
-lib/libfreebsd-glue.so.*
+usr/lib/libfreebsd-glue.so.*
diff --minimal -Nru freebsd-glue-0.2.22+nmu1/debian/rules
freebsd-glue-0.2.22+nmu2/debian/rules
--- freebsd-glue-0.2.22+nmu1/debian/rules 2023-08-07 01:20:16.000000000
+0200
+++ freebsd-glue-0.2.22+nmu2/debian/rules 2024-02-09 15:28:57.000000000
+0100
@@ -29,6 +29,7 @@
MAKEOBJDIRPREFIX=$(CURDIR)/obj-deb \
CFLAGS="$(CFLAGS) -O2" \
DESTDIR="$(DESTDIR)" \
+ SHLIBDIR=/usr/lib \
bmake -m /usr/share/mk-freebsd \
CC=$(CC) \
$(NULL)
@@ -37,6 +38,7 @@
MAKEOBJDIRPREFIX=$(CURDIR)/obj-udeb \
CFLAGS="$(CFLAGS) -Os" \
DESTDIR="$(DESTDIR)-udeb" \
+ SHLIBDIR=/usr/lib \
bmake -m /usr/share/mk-freebsd \
CC=$(CC) \
RESCUE=yes \
@@ -76,7 +78,7 @@
dh_testroot
dh_prep -a
dh_installdirs -a
- mkdir -p $(DESTDIR){,-udeb}/{usr/,}lib
+ mkdir -p $(DESTDIR){,-udeb}/usr/lib
$(PMAKE) install
$(PMAKE_UDEB) install
