From bab8d5080a0b636a7863112ffce60cd9276de1de Mon Sep 17 00:00:00 2001
From: David Allsopp <david.allsopp@metastack.com>
Date: Wed, 13 Mar 2024 10:56:00 +0000
Subject: [PATCH 1/2] Sync layout of opam file with opam-repository

No changes other than layout.
---
 mccs.opam | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/mccs.opam b/mccs.opam
index 598fa43..e6ea315 100644
--- a/mccs.opam
+++ b/mccs.opam
@@ -1,23 +1,28 @@
 opam-version: "2.0"
 version: "1.1+17"
+synopsis: """\
+MCCS (which stands for Multi Criteria CUDF Solver) is a CUDF problem solver
+developed at UNS during the European MANCOOSI project"""
 maintainer: "Louis Gesbert <louis.gesbert@ocamlpro.com>"
 authors: [
   "Claude Michel <claude.michel@unice.fr>"
   "Louis Gesbert <louis.gesbert@ocamlpro.com>"
 ]
+license: [
+  "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+  "BSD-3-clause"
+  "GPL-3.0-only"
+]
 homepage: "https://www.i3s.unice.fr/~cpjm/misc/"
 bug-reports: "https://github.com/ocaml-opam/ocaml-mccs/issues"
-license: ["LGPL-2.1-only WITH OCaml-LGPL-linking-exception" "BSD-3-clause" "GPL-3.0-only"]
-dev-repo: "git+https://github.com/ocaml-opam/ocaml-mccs.git"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["sh" "-c" "dune build @settests --auto-promote || true"] {with-test}
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
 depends: [
   "ocaml"
   "dune" {>= "1.0"}
   "cudf" {>= "0.7"}
 ]
-synopsis: "MCCS (which stands for Multi Criteria CUDF Solver) is a CUDF problem solver
-developed at UNS during the European MANCOOSI project"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["sh" "-c" "dune build @settests --auto-promote || true"] {with-test}
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/ocaml-opam/ocaml-mccs.git"

From 65497ef638caa1ac2040681e09e1d3010f027a14 Mon Sep 17 00:00:00 2001
From: David Allsopp <david.allsopp@metastack.com>
Date: Wed, 13 Mar 2024 10:56:24 +0000
Subject: [PATCH 2/2] Adding missing dependency on conf-c++

---
 mccs.opam | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mccs.opam b/mccs.opam
index e6ea315..8a5bc27 100644
--- a/mccs.opam
+++ b/mccs.opam
@@ -19,6 +19,7 @@ depends: [
   "ocaml"
   "dune" {>= "1.0"}
   "cudf" {>= "0.7"}
+  "conf-c++" {build}
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]