Version in base suite: 2.0.3-1

Base version: opam_2.0.3-1
Target version: opam_2.0.3-1+deb10u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/o/opam/opam_2.0.3-1.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/o/opam/opam_2.0.3-1+deb10u1.dsc

 changelog                                  |    7 +++++++
 control                                    |    4 ++--
 gbp.conf                                   |    2 ++
 patches/0003-Prefer-mccs-over-aspcud.patch |   25 +++++++++++++++++++++++++
 patches/series                             |    1 +
 5 files changed, 37 insertions(+), 2 deletions(-)

diff -Nru opam-2.0.3/debian/changelog opam-2.0.3/debian/changelog
--- opam-2.0.3/debian/changelog	2019-02-01 11:05:09.000000000 +0000
+++ opam-2.0.3/debian/changelog	2020-02-18 06:42:31.000000000 +0000
@@ -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 09:13:14.000000000 +0000
+++ opam-2.0.3/debian/control	2020-02-18 06:42:31.000000000 +0000
@@ -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 11:53:29.000000000 +0000
+++ opam-2.0.3/debian/gbp.conf	2020-02-18 06:42:31.000000000 +0000
@@ -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 00:00:00.000000000 +0000
+++ opam-2.0.3/debian/patches/0003-Prefer-mccs-over-aspcud.patch	2020-02-18 06:42:31.000000000 +0000
@@ -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 11:04:22.000000000 +0000
+++ opam-2.0.3/debian/patches/series	2020-02-18 06:42:31.000000000 +0000
@@ -1,2 +1,3 @@
 0002-Add-a-test-target.patch
 0002-Fix-spelling-error-in-manpage.patch
+0003-Prefer-mccs-over-aspcud.patch