Hi, On Fri, Oct 27, 2023 at 09:42:50PM +0200, Lucas Nussbaum wrote:
; windows_unicode = false } ; instrument_with = [] } Actual targets: - _build/default/opam-installer.install - _build/default/opam.install Running[1]: (cd _build/default/src/client && /bin/sh -c 'git describe --exact HEAD || echo [dev]') > _build/default/src/client/git-describe 2> /dev/null Running[2]: (cd _build/default/src/client && /bin/sh -c 'git rev-parse --quiet --verify HEAD || echo .') > _build/default/src/client/git-sha 2> /dev/null sed -f process.sed opam.install > processed-opam.install sed: can't read opam.install: No such file or directory make[2]: *** [Makefile:166: processed-opam.install] Error 2
Just fyi, I have commited one patch to salsa: https://salsa.debian.org/ocaml-team/opam/-/commit/ce22a7ae844e4bb9266748beb23a6750afb3c3f6 It was the same with debdiff file. But there is one issue was unclear to me, see https://lists.debian.org/debian-ocaml-maint/2024/04/msg00028.html -- Regards, -- Bo YU
diff -Nru opam-2.1.5/debian/changelog opam-2.1.5/debian/changelog --- opam-2.1.5/debian/changelog 2023-09-02 13:35:29.000000000 +0800 +++ opam-2.1.5/debian/changelog 2024-04-06 22:30:28.000000000 +0800 @@ -1,3 +1,10 @@ +opam (2.1.5-2) UNRELEASED; urgency=medium + + * Team upload. + * Add 0003-opam-dune-3.11.patch to fix ftbfs issue. (Closes: #1054822) + + -- Bo YU <tsu.y...@gmail.com> Sat, 06 Apr 2024 22:30:28 +0800 + opam (2.1.5-1) unstable; urgency=medium * Team upload diff -Nru opam-2.1.5/debian/patches/0003-opam-dune-3.11.patch opam-2.1.5/debian/patches/0003-opam-dune-3.11.patch --- opam-2.1.5/debian/patches/0003-opam-dune-3.11.patch 1970-01-01 08:00:00.000000000 +0800 +++ opam-2.1.5/debian/patches/0003-opam-dune-3.11.patch 2024-04-06 22:30:28.000000000 +0800 @@ -0,0 +1,20 @@ +Description: fix ftbfs due to opam-dune 3.11 +Origin: https://src.fedoraproject.org/rpms/opam/blob/rawhide/f/opam-dune-3.11.patch +Bug: https://bugs.debian.org/1054822 +Last-Update: 2024-04-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Makefile ++++ b/Makefile +@@ -162,7 +162,10 @@ + $(DUNE) install --root . opam-$$p; \ + done + +-processed-%.install: %.install ++processed-opam.install: _build/default/opam.install ++ sed -f process.sed $^ > $@ ++ ++processed-opam-installer.install: _build/default/opam-installer.install + sed -f process.sed $^ > $@ + + install: processed-opam.install processed-opam-installer.install diff -Nru opam-2.1.5/debian/patches/series opam-2.1.5/debian/patches/series --- opam-2.1.5/debian/patches/series 2023-09-02 13:35:29.000000000 +0800 +++ opam-2.1.5/debian/patches/series 2024-04-06 22:30:28.000000000 +0800 @@ -1,2 +1,3 @@ 0001-Add-a-test-target.patch 0002-Use-HOME-env-variable-instead-of.patch +0003-opam-dune-3.11.patch
signature.asc
Description: PGP signature
