Louis-Philippe Véronneau pushed to branch master at lintian / lintian
Commits: 00c738c0 by Bo YU at 2025-08-22T18:36:01+00:00 improve ocaml-dev-file-not-in-usr-lib-ocaml tag given the commit[0], now the ocaml dev file should be put under new usr/lib subdir. Closes(#1078561) [0]: https://salsa.debian.org/ocaml-team/ocaml/-/commit/652e3e829bb1ede5fd75bef3b5e6f0f14d3d0436 Signed-off-by: Bo YU <[email protected]> - - - - - 4 changed files: - lib/Lintian/Check/Languages/Ocaml/ByteCode/Misplaced/Path.pm - t/recipes/checks/languages/ocaml/byte-code/misplaced/path/ocaml-general/build-spec/debian/libocaml-general-ocaml-dev.install - t/recipes/checks/languages/ocaml/byte-code/misplaced/path/ocaml-general/build-spec/debian/libocaml-general-ocaml.install - tags/o/ocaml-dev-file-not-in-usr-lib-ocaml.tag Changes: ===================================== lib/Lintian/Check/Languages/Ocaml/ByteCode/Misplaced/Path.pm ===================================== @@ -41,9 +41,9 @@ has misplaced_files => (is => 'rw', default => sub { [] }); sub visit_installed_files { my ($self, $item) = @_; - # development files outside /usr/lib/ocaml (.cmi, .cmx, .cmxa) +# development files outside /usr/lib/<multiarch>/ocaml/<abi> (.cmi, .cmx, .cmxa) return - if $item->name =~ m{^ usr/lib/ocaml/ }x; + if $item->name =~ m{^ usr/lib/[^/]+/ocaml/[^/]+/ }x; # .cma, .cmo and .cmxs are excluded because they can be plugins push(@{$self->misplaced_files}, $item->name) ===================================== t/recipes/checks/languages/ocaml/byte-code/misplaced/path/ocaml-general/build-spec/debian/libocaml-general-ocaml-dev.install ===================================== @@ -1,12 +1,12 @@ symbol-dev.a usr/lib/ocaml/ libbaz.a usr/lib/ocaml/ ocaml/foo.cmi usr/lib/ -ocaml/foo.cmi usr/lib/ocaml/ -ocaml/bar.cmi usr/lib/ocaml/ -ocaml/baz.cmi usr/lib/ocaml/ -ocaml/boo.cmi usr/lib/ocaml/ -ocaml/symbol2.cmx usr/lib/ocaml/ -ocaml/symbol-dev.cmx usr/lib/ocaml/ +ocaml/foo.cmi usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/ +ocaml/bar.cmi usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/ +ocaml/baz.cmi usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/ +ocaml/boo.cmi usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/ +ocaml/symbol2.cmx usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/ +ocaml/symbol-dev.cmx usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/ ocaml/bleh.cmo usr/lib/ocaml/ ocaml/bleh.cma usr/lib/ocaml/ ocaml/META usr/lib/ocaml/ ===================================== t/recipes/checks/languages/ocaml/byte-code/misplaced/path/ocaml-general/build-spec/debian/libocaml-general-ocaml.install ===================================== @@ -1,3 +1,3 @@ -ocaml/foo.cmxa usr/lib/ocaml/ +ocaml/foo.cmxa usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/ ocaml/bar.cmxs usr/lib/ocaml/ -ocaml/symbol.cmx usr/lib/ocaml/ +ocaml/symbol.cmx usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/ ===================================== tags/o/ocaml-dev-file-not-in-usr-lib-ocaml.tag ===================================== @@ -3,7 +3,7 @@ Severity: pedantic Check: languages/ocaml/byte-code/misplaced/path Explanation: This OCaml package ships development files like <code>*.cmi</code>, <code>*.cmx</code> or <code>*.cmxa</code> outside of the standard folder - <code>/usr/lib/ocaml</code>. + <code>/usr/lib/<multiarch>/ocaml/<abi></code>. . Those files are used only for compilation and should be placed in a subfolder of the standard OCaml library path. View it on GitLab: https://salsa.debian.org/lintian/lintian/-/commit/00c738c007198d89a87b23f6a0c7e37e4f4604a7 -- View it on GitLab: https://salsa.debian.org/lintian/lintian/-/commit/00c738c007198d89a87b23f6a0c7e37e4f4604a7 You're receiving this email because of your account on salsa.debian.org.
