[Pkg-libvirt-maintainers] Bug#1077896: Please do not hardcode /usr/lib/ocaml

[Stéphane Glondu]

Source: hivex
Version: 1.3.23-1
Severity: important
Tags: patch
User: debian-ocaml-maint at lists.debian.org
Usertags: ocaml-5.2.0-transition

Dear Maintainer,

Please do not hardcode /usr/lib/ocaml in your package, as it might
change in the future.

Attached is a patch that fixes the issue.

Cheers,

-- 
Stéphane


-- System Information:
Debian Release: trixie/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'buildd-unstable'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.5.0-5-amd64 (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
>From 0e5db4b26d924e377737c43642ad67f48ad4a1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Glondu?= <glondu at debian.org>
Date: Sun, 4 Aug 2024 09:29:02 +0200
Subject: [PATCH] Do not hardcode /usr/lib/ocaml

---
 debian/libhivex-ocaml-dev.install    | 4 ----
 debian/libhivex-ocaml-dev.install.in | 4 ++++
 debian/libhivex-ocaml.install        | 1 -
 debian/libhivex-ocaml.install.in     | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 debian/libhivex-ocaml-dev.install
 create mode 100644 debian/libhivex-ocaml-dev.install.in
 delete mode 100644 debian/libhivex-ocaml.install
 create mode 100644 debian/libhivex-ocaml.install.in

diff --git a/debian/libhivex-ocaml-dev.install b/debian/libhivex-ocaml-dev.install
deleted file mode 100644
index 4f7c141..0000000
--- a/debian/libhivex-ocaml-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/ocaml/hivex/META
-usr/lib/ocaml/hivex/*.a
-usr/lib/ocaml/hivex/*.cm*
-usr/lib/ocaml/hivex/*.ml*
diff --git a/debian/libhivex-ocaml-dev.install.in b/debian/libhivex-ocaml-dev.install.in
new file mode 100644
index 0000000..b5264d4
--- /dev/null
+++ b/debian/libhivex-ocaml-dev.install.in
@@ -0,0 +1,4 @@
+ at OCamlStdlibDir@/hivex/META
+ at OCamlStdlibDir@/hivex/*.a
+ at OCamlStdlibDir@/hivex/*.cm*
+ at OCamlStdlibDir@/hivex/*.ml*
diff --git a/debian/libhivex-ocaml.install b/debian/libhivex-ocaml.install
deleted file mode 100644
index bdbcc13..0000000
--- a/debian/libhivex-ocaml.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ocaml/stublibs/dllmlhivex.so
diff --git a/debian/libhivex-ocaml.install.in b/debian/libhivex-ocaml.install.in
new file mode 100644
index 0000000..929ddfb
--- /dev/null
+++ b/debian/libhivex-ocaml.install.in
@@ -0,0 +1 @@
+ at OCamlDllDir@/dllmlhivex.so
-- 
2.43.0