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

[Stéphane Glondu]

Source: libguestfs
Version: 1:1.52.2-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 f1b8ad30143fab7933232546b38b2e2a1e812adb 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:52:01 +0200
Subject: [PATCH] Do not hardcode /usr/lib/ocaml

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

diff --git a/debian/libguestfs-ocaml-dev.install b/debian/libguestfs-ocaml-dev.install
deleted file mode 100644
index 967d5c5..0000000
--- a/debian/libguestfs-ocaml-dev.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/ocaml/guestfs/META
-usr/lib/ocaml/guestfs/*guestfs*.a
-usr/lib/ocaml/guestfs/*guestfs*.cm*
-usr/lib/ocaml/guestfs/*guestfs*.ml*
-
-usr/share/man/man3/guestfs-ocaml.3*
-usr/share/man/*/man3/guestfs-ocaml.3*
diff --git a/debian/libguestfs-ocaml-dev.install.in b/debian/libguestfs-ocaml-dev.install.in
new file mode 100644
index 0000000..d56b8b9
--- /dev/null
+++ b/debian/libguestfs-ocaml-dev.install.in
@@ -0,0 +1,7 @@
+ at OCamlStdlibDir@/guestfs/META
+ at OCamlStdlibDir@/guestfs/*guestfs*.a
+ at OCamlStdlibDir@/guestfs/*guestfs*.cm*
+ at OCamlStdlibDir@/guestfs/*guestfs*.ml*
+
+usr/share/man/man3/guestfs-ocaml.3*
+usr/share/man/*/man3/guestfs-ocaml.3*
diff --git a/debian/libguestfs-ocaml.install b/debian/libguestfs-ocaml.install
deleted file mode 100644
index 9df0bc1..0000000
--- a/debian/libguestfs-ocaml.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ocaml/stublibs/dllmlguestfs.so
diff --git a/debian/libguestfs-ocaml.install.in b/debian/libguestfs-ocaml.install.in
new file mode 100644
index 0000000..9e14df1
--- /dev/null
+++ b/debian/libguestfs-ocaml.install.in
@@ -0,0 +1 @@
+ at OCamlDllDir@/dllmlguestfs.so
-- 
2.43.0