[DSE-Dev] Bug#914247: Please move library to /usr/lib

[Michael Biebl]

Source: libselinux
Version: 2.8-1+b1
Severity: normal
Tags: patch

Hi,

since late-mounted /usr is no longer supported, the artifical split
between /lib and /usr/lib no longer is really useful.
Therefor please consider moving the libraries to /usr/lib.
The attached (build tested) patch should do that.

Regards,
Michael


-- System Information:
Debian Release: buster/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
diff -Nru libselinux-2.8/debian/changelog libselinux-2.8/debian/changelog
--- libselinux-2.8/debian/changelog	2018-05-28 20:50:31.000000000 +0200
+++ libselinux-2.8/debian/changelog	2018-11-20 22:29:39.000000000 +0100
@@ -1,3 +1,10 @@
+libselinux (2.8-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move libselinux to /usr/lib.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 20 Nov 2018 22:29:39 +0100
+
 libselinux (2.8-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru libselinux-2.8/debian/libselinux1.install libselinux-2.8/debian/libselinux1.install
--- libselinux-2.8/debian/libselinux1.install	2018-05-28 20:50:31.000000000 +0200
+++ libselinux-2.8/debian/libselinux1.install	2018-11-20 22:27:22.000000000 +0100
@@ -1 +1 @@
-lib/*/*.so*
+usr/lib/*/*.so*
diff -Nru libselinux-2.8/debian/libselinux1-udeb.install libselinux-2.8/debian/libselinux1-udeb.install
--- libselinux-2.8/debian/libselinux1-udeb.install	2018-05-28 20:50:31.000000000 +0200
+++ libselinux-2.8/debian/libselinux1-udeb.install	2018-11-20 22:27:28.000000000 +0100
@@ -1 +1 @@
-lib/*/*.so* /lib
+usr/lib/*/*.so*
diff -Nru libselinux-2.8/debian/rules libselinux-2.8/debian/rules
--- libselinux-2.8/debian/rules	2018-05-28 20:50:31.000000000 +0200
+++ libselinux-2.8/debian/rules	2018-11-20 22:28:32.000000000 +0100
@@ -60,8 +60,7 @@
 DESTDIR = $(CURDIR)/debian/tmp
 base_extra_install_args  = $(extra_make_args)
 base_extra_install_args += DESTDIR=$(DESTDIR)
-extra_install_args = $(base_extra_install_args) LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-extra_install_args += SHLIBDIR=/lib/$(DEB_HOST_MULTIARCH)
+extra_install_args = $(base_extra_install_args) LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) SHLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 python_extra_install_args = $(base_extra_install_args) LIBDIR=/usr/lib
 
 override_dh_auto_install: FORCE
-------------- next part --------------
diff -Nru libselinux-2.8/debian/changelog libselinux-2.8/debian/changelog
--- libselinux-2.8/debian/changelog	2018-05-28 20:50:31.000000000 +0200
+++ libselinux-2.8/debian/changelog	2018-11-20 22:29:39.000000000 +0100
@@ -1,3 +1,10 @@
+libselinux (2.8-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move libselinux to /usr/lib.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 20 Nov 2018 22:29:39 +0100
+
 libselinux (2.8-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru libselinux-2.8/debian/libselinux1.install libselinux-2.8/debian/libselinux1.install
--- libselinux-2.8/debian/libselinux1.install	2018-05-28 20:50:31.000000000 +0200
+++ libselinux-2.8/debian/libselinux1.install	2018-11-20 22:27:22.000000000 +0100
@@ -1 +1 @@
-lib/*/*.so*
+usr/lib/*/*.so*
diff -Nru libselinux-2.8/debian/libselinux1-udeb.install libselinux-2.8/debian/libselinux1-udeb.install
--- libselinux-2.8/debian/libselinux1-udeb.install	2018-05-28 20:50:31.000000000 +0200
+++ libselinux-2.8/debian/libselinux1-udeb.install	2018-11-20 22:27:28.000000000 +0100
@@ -1 +1 @@
-lib/*/*.so* /lib
+usr/lib/*/*.so*
diff -Nru libselinux-2.8/debian/rules libselinux-2.8/debian/rules
--- libselinux-2.8/debian/rules	2018-05-28 20:50:31.000000000 +0200
+++ libselinux-2.8/debian/rules	2018-11-20 22:28:32.000000000 +0100
@@ -60,8 +60,7 @@
 DESTDIR = $(CURDIR)/debian/tmp
 base_extra_install_args  = $(extra_make_args)
 base_extra_install_args += DESTDIR=$(DESTDIR)
-extra_install_args = $(base_extra_install_args) LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-extra_install_args += SHLIBDIR=/lib/$(DEB_HOST_MULTIARCH)
+extra_install_args = $(base_extra_install_args) LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) SHLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 python_extra_install_args = $(base_extra_install_args) LIBDIR=/usr/lib
 
 override_dh_auto_install: FORCE