From 24e97948e1d3f3774484f26e6c18338ac266d02a Mon Sep 17 00:00:00 2001
From: xvw <xavier.vdw@gmail.com>
Date: Tue, 7 May 2024 11:06:57 +0200
Subject: [PATCH] Move `merlin-lib-commands` in `merlin-lib`

As suggested, `merlin-lib-command` doesn't add any additional
dependencies, so it can easily be packaged in `merlin-lib`.
---
 merlin-lib-commands.opam      | 25 -------------------------
 src/commands/dune             |  2 +-
 src/frontend/ocamlmerlin/dune |  2 +-
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 merlin-lib-commands.opam

diff --git a/merlin-lib-commands.opam b/merlin-lib-commands.opam
deleted file mode 100644
index 3d18b7ef2..000000000
--- a/merlin-lib-commands.opam
+++ /dev/null
@@ -1,25 +0,0 @@
-opam-version: "2.0"
-maintainer:   "xaviervdw@gmail.com"
-authors:      "The Merlin team"
-homepage:     "https://github.com/ocaml/merlin"
-bug-reports:  "https://github.com/ocaml/merlin/issues"
-dev-repo:     "git+https://github.com/ocaml/merlin.git"
-license:      "MIT"
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml" {>= "4.14" & < "4.15"}
-  "dune" {>= "2.9.0"}
-  "merlin-lib" {= version}
-  "yojson" {>= "2.0.0"}
-]
-
-synopsis:
-  "Merlin's Protocol libraries"
-
-description:
-  "These libraries provide the glue between the Merlin server and
-  Merlin's low-level interface to expose the protocol (allowing it to be used
-  outside the Merlin server, by ocaml-lsp for example)."
diff --git a/src/commands/dune b/src/commands/dune
index 7e8c693c1..016727ba0 100644
--- a/src/commands/dune
+++ b/src/commands/dune
@@ -1,6 +1,6 @@
 (library
   (name merlin_commands)
-  (public_name merlin-lib-commands)
+  (public_name merlin-lib.commands)
   (flags
     :standard
     -open Ocaml_parsing
diff --git a/src/frontend/ocamlmerlin/dune b/src/frontend/ocamlmerlin/dune
index 379d44efe..8b17d252d 100644
--- a/src/frontend/ocamlmerlin/dune
+++ b/src/frontend/ocamlmerlin/dune
@@ -19,7 +19,7 @@
             merlin-lib.utils merlin-lib.os_ipc merlin-lib.ocaml_parsing
             merlin-lib.query_protocol merlin-lib.query_commands
             merlin-lib.ocaml_typing merlin-lib.ocaml_utils
-            merlin-lib-commands
+            merlin-lib.commands
             unix str))
 
 (executable