Merge pull request #27569 from hannesm/lsp-maint

raphael-proust · web-flow · commit 1f7edfe51a81 · 2025-03-06T15:07:30.000+01:00
lsp, merlin: use x-maintenance-intent from upstream
diff --git a/packages/dot-merlin-reader/dot-merlin-reader.5.4.1-503/opam b/packages/dot-merlin-reader/dot-merlin-reader.5.4.1-503/opam
@@ -28,3 +28,4 @@ url {
   ]
 }
 x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"
+x-maintenance-intent: [ "(latest)" ]
diff --git a/packages/jsonrpc/jsonrpc.1.22.0/opam b/packages/jsonrpc/jsonrpc.1.22.0/opam
@@ -37,7 +37,7 @@ build: [
   ]
 ]
 
-x-maintenance-intent: [ "(latest)" "(latest)-414" ]
+x-maintenance-intent: [ "(latest)" ]
 url {
   src:
     "https://github.com/ocaml/ocaml-lsp/releases/download/1.22.0/lsp-1.22.0.tbz"
diff --git a/packages/lsp/lsp.1.22.0/opam b/packages/lsp/lsp.1.22.0/opam
@@ -48,7 +48,7 @@ build: [
   ]
 ]
 
-x-maintenance-intent: [ "(latest)" "(latest)-414" ]
+x-maintenance-intent: [ "(latest)" ]
 url {
   src:
     "https://github.com/ocaml/ocaml-lsp/releases/download/1.22.0/lsp-1.22.0.tbz"
diff --git a/packages/merlin-lib/merlin-lib.5.4.1-503/opam b/packages/merlin-lib/merlin-lib.5.4.1-503/opam
@@ -33,3 +33,4 @@ url {
   ]
 }
 x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"
+x-maintenance-intent: [ "(latest)" ]
diff --git a/packages/merlin/merlin.5.4.1-503/opam b/packages/merlin/merlin.5.4.1-503/opam
@@ -78,3 +78,4 @@ url {
   ]
 }
 x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"
+x-maintenance-intent: [ "(latest)" ]
diff --git a/packages/ocaml-index/ocaml-index.5.4.1-503/opam b/packages/ocaml-index/ocaml-index.5.4.1-503/opam
@@ -39,3 +39,4 @@ url {
   ]
 }
 x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"
+x-maintenance-intent: [ "(latest)" ]
diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.22.0/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.22.0/opam
@@ -63,7 +63,7 @@ build: [
   ]
 ]
 
-x-maintenance-intent: [ "(latest)" "(latest)-414" ]
+x-maintenance-intent: [ "(latest)" ]
 url {
   src:
     "https://github.com/ocaml/ocaml-lsp/releases/download/1.22.0/lsp-1.22.0.tbz"

Original file line number	Diff line number	Diff line change
`@@ -28,3 +28,4 @@ url {`
`28`	`28`	`]`
`29`	`29`	`}`
`30`	`30`	`x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"`
	`31`	`+x-maintenance-intent: [ "(latest)" ]`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ build: [`
`37`	`37`	`]`
`38`	`38`	`]`
`39`	`39`
`40`		`-x-maintenance-intent: [ "(latest)" "(latest)-414" ]`
	`40`	`+x-maintenance-intent: [ "(latest)" ]`
`41`	`41`	`url {`
`42`	`42`	`src:`
`43`	`43`	`"https://github.com/ocaml/ocaml-lsp/releases/download/1.22.0/lsp-1.22.0.tbz"`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ build: [`
`48`	`48`	`]`
`49`	`49`	`]`
`50`	`50`
`51`		`-x-maintenance-intent: [ "(latest)" "(latest)-414" ]`
	`51`	`+x-maintenance-intent: [ "(latest)" ]`
`52`	`52`	`url {`
`53`	`53`	`src:`
`54`	`54`	`"https://github.com/ocaml/ocaml-lsp/releases/download/1.22.0/lsp-1.22.0.tbz"`
Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,4 @@ url {`
`33`	`33`	`]`
`34`	`34`	`}`
`35`	`35`	`x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"`
	`36`	`+x-maintenance-intent: [ "(latest)" ]`
Original file line number	Diff line number	Diff line change
`@@ -78,3 +78,4 @@ url {`
`78`	`78`	`]`
`79`	`79`	`}`
`80`	`80`	`x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"`
	`81`	`+x-maintenance-intent: [ "(latest)" ]`
Original file line number	Diff line number	Diff line change
`@@ -39,3 +39,4 @@ url {`
`39`	`39`	`]`
`40`	`40`	`}`
`41`	`41`	`x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"`
	`42`	`+x-maintenance-intent: [ "(latest)" ]`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ build: [`
`63`	`63`	`]`
`64`	`64`	`]`
`65`	`65`
`66`		`-x-maintenance-intent: [ "(latest)" "(latest)-414" ]`
	`66`	`+x-maintenance-intent: [ "(latest)" ]`
`67`	`67`	`url {`
`68`	`68`	`src:`
`69`	`69`	`"https://github.com/ocaml/ocaml-lsp/releases/download/1.22.0/lsp-1.22.0.tbz"`