Control: tags 985509 + patch
Control: tags 985509 + pending
Dear openrc maintainers,
I've prepared an NMU for openrc (versioned as 0.42-2.1) to address #985509 and
uploaded it to DELAYED/2. Please feel free to tell me if I should delay it
longer.
Regards.
Mark
diff -Nru openrc-0.42/debian/changelog openrc-0.42/debian/changelog
--- openrc-0.42/debian/changelog 2020-11-27 08:48:35.000000000 +0000
+++ openrc-0.42/debian/changelog 2021-04-02 11:16:00.000000000 +0100
@@ -1,3 +1,11 @@
+openrc (0.42-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Make -dev package symlinks in /usr/lib target shared libraries in
+ /lib. (Closes: #985509).
+
+ -- Mark Hindley <lee...@debian.org> Fri, 02 Apr 2021 11:16:00 +0100
+
openrc (0.42-2) unstable; urgency=medium
* Team upload.
diff -Nru openrc-0.42/debian/libeinfo-dev.links.in
openrc-0.42/debian/libeinfo-dev.links.in
--- openrc-0.42/debian/libeinfo-dev.links.in 1970-01-01 01:00:00.000000000
+0100
+++ openrc-0.42/debian/libeinfo-dev.links.in 2021-04-02 11:16:00.000000000
+0100
@@ -0,0 +1 @@
+@SHLIBDIR@/libeinfo.so.1 @LIBDIR@/libeinfo.so
diff -Nru openrc-0.42/debian/librc-dev.install.in
openrc-0.42/debian/librc-dev.install.in
--- openrc-0.42/debian/librc-dev.install.in 2020-11-27 08:48:35.000000000
+0000
+++ openrc-0.42/debian/librc-dev.install.in 2021-04-02 11:16:00.000000000
+0100
@@ -1,4 +1,3 @@
-debian/tmp@SHLIBDIR@/librc.so /usr@SHLIBDIR@
debian/tmp/usr/include/rc.h /usr/include
debian/tmp@LIBDIR@/pkgconfig/openrc.pc @LIBDIR@/pkgconfig
debian/tmp/usr/share/man/man3/r* /usr/share/man/man3
diff -Nru openrc-0.42/debian/librc-dev.links.in
openrc-0.42/debian/librc-dev.links.in
--- openrc-0.42/debian/librc-dev.links.in 1970-01-01 01:00:00.000000000
+0100
+++ openrc-0.42/debian/librc-dev.links.in 2021-04-02 11:16:00.000000000
+0100
@@ -0,0 +1 @@
+@SHLIBDIR@/librc.so.1 @LIBDIR@/librc.so
diff -Nru openrc-0.42/debian/rules openrc-0.42/debian/rules
--- openrc-0.42/debian/rules 2020-11-27 08:48:35.000000000 +0000
+++ openrc-0.42/debian/rules 2021-04-02 11:16:00.000000000 +0100
@@ -15,7 +15,7 @@
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DH_INSTALL_FILES = $(basename $(wildcard debian/*.install.in))
+DH_INSTALL_FILES = $(basename $(wildcard debian/*.install.in) $(wildcard
debian/*.links.in))
export LIBDIR = /usr/lib/$(DEB_HOST_MULTIARCH)
export SHLIBDIR = /lib/$(DEB_HOST_MULTIARCH)
@@ -35,6 +35,9 @@
%.install: %.install.in
sed -e 's;@SHLIBDIR@;$(SHLIBDIR);g' -e 's;@LIBDIR@;$(LIBDIR);g' <$< >$@
+%.links: %.links.in
+ sed -e 's;@SHLIBDIR@;$(SHLIBDIR);g' -e 's;@LIBDIR@;$(LIBDIR);g' <$< >$@
+
override_dh_auto_clean:
dh_auto_clean
rm -f $(DH_INSTALL_FILES)
