Bug#951761: buster-pu: package opam/2.0.3-1
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
Dear Release Managers,
It has been brought to my attention that opam doesn't work in buster
out of the box. This has been tracked in [1] (fixed in testing) and
[2]. See in particular comments starting at [3].
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908203
[2] https://github.com/ocaml/opam/issues/3827
[3] https://github.com/ocaml/opam/issues/3827#issuecomment-586265289
Martin Lucina (@mato on GitHub) proposed some changes to improve the
situation.
I've attached the proposed changes. I would like to apply them in a
buster update.
Cheers,
--
Stéphane
-- System Information:
Debian Release: bullseye/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 5.3.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru opam-2.0.3/debian/changelog opam-2.0.3/debian/changelog
--- opam-2.0.3/debian/changelog 2019-02-01 12:05:09.000000000 +0100
+++ opam-2.0.3/debian/changelog 2020-02-18 07:42:31.000000000 +0100
@@ -1,3 +1,10 @@
+opam (2.0.3-1+deb10u1) buster; urgency=medium
+
+ * Team upload
+ * Prefer mccs over aspcud (Closes: #908203)
+
+ -- Stéphane Glondu <glondu@debian.org> Tue, 18 Feb 2020 07:42:31 +0100
+
opam (2.0.3-1) unstable; urgency=medium
* New (bugfix) upstream release
diff -Nru opam-2.0.3/debian/control opam-2.0.3/debian/control
--- opam-2.0.3/debian/control 2019-02-01 10:13:14.000000000 +0100
+++ opam-2.0.3/debian/control 2020-02-18 07:37:20.000000000 +0100
@@ -22,7 +22,7 @@
libopam-file-format-ocaml-dev,
libjsonm-ocaml-dev,
libopam-file-format-ocaml-dev,
- aspcud,
+ mccs,
rsync,
unzip,
openssl,
@@ -50,7 +50,7 @@
${misc:Depends},
opam-doc (= ${source:Version}),
build-essential,
- aspcud | mccs | packup,
+ mccs,
opam-installer,
bubblewrap [linux-any],
unzip,
diff -Nru opam-2.0.3/debian/gbp.conf opam-2.0.3/debian/gbp.conf
--- opam-2.0.3/debian/gbp.conf 2018-12-02 12:53:29.000000000 +0100
+++ opam-2.0.3/debian/gbp.conf 2020-02-18 07:33:43.000000000 +0100
@@ -8,3 +8,5 @@
"src_ext",
"ocp-build"
]
+debian-branch = buster/master
+upstream-branch = buster/upstream
diff -Nru opam-2.0.3/debian/patches/0003-Prefer-mccs-over-aspcud.patch opam-2.0.3/debian/patches/0003-Prefer-mccs-over-aspcud.patch
--- opam-2.0.3/debian/patches/0003-Prefer-mccs-over-aspcud.patch 1970-01-01 01:00:00.000000000 +0100
+++ opam-2.0.3/debian/patches/0003-Prefer-mccs-over-aspcud.patch 2020-02-18 07:40:53.000000000 +0100
@@ -0,0 +1,25 @@
+From: Martin Lucina <mato@users.noreply.github.com>
+Date: Tue, 18 Feb 2020 07:37:04 +0100
+Subject: Prefer mccs over aspcud
+
+Bug-Debian: https://bugs.debian.org/908203
+Bug: https://github.com/ocaml/opam/issues/3827
+Origin: https://github.com/ocaml/opam/issues/3827#issuecomment-586945810
+---
+ src/solver/opamCudfSolver.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..b3b8aa6 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -215,8 +215,8 @@ let make_custom_solver name args criteria =
+
+ let default_solver_selection =
+ OpamBuiltinMccs.all_backends @ [
+- (module Aspcud: S);
+ (module Mccs: S);
++ (module Aspcud: S);
+ (module Aspcud_old: S);
+ (module Packup: S);
+ ]
diff -Nru opam-2.0.3/debian/patches/series opam-2.0.3/debian/patches/series
--- opam-2.0.3/debian/patches/series 2019-02-01 12:04:22.000000000 +0100
+++ opam-2.0.3/debian/patches/series 2020-02-18 07:40:53.000000000 +0100
@@ -1,2 +1,3 @@
0002-Add-a-test-target.patch
0002-Fix-spelling-error-in-manpage.patch
+0003-Prefer-mccs-over-aspcud.patch
Reply to: