From 2fb7926cb0b04f9bcaaa3af6c2be9c8b009831e6 Mon Sep 17 00:00:00 2001
From: David Allsopp <david.allsopp@metastack.com>
Date: Wed, 21 Apr 2021 15:09:16 +0100
Subject: [PATCH] Bump to opam-file-format 2.1.3

---
 master_changes.md | 2 ++
 opam-admin.opam   | 2 +-
 opam-format.opam  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/master_changes.md b/master_changes.md
index 0f2b965dca6..0821cea13c3 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -68,6 +68,8 @@ New option/command/subcommand are prefixed with ◈.
   * Fix `features` parser [#4507 @rjbou]
   * Rename `hidden-version` to `avoid-version` [#4527 @dra27]
   * Fix rewriting with preserved format empty field error [#4634 @rjbou - fix #4628]
+  * Fix rewrtiting with preserved format empty field error [#4633 @rjbou - fix #4628]
+  * Require opam-file-format 2.1.3+ in order to enforce opam-version: "2.1" as first non-comment line [#4639 @dra27 - fix #4394]
 
 ## External dependencies
   * Handle macport variants [#4509 @rjbou - fix #4297]
diff --git a/opam-admin.opam b/opam-admin.opam
index 9f2e2b3f322..a43e9b53be9 100644
--- a/opam-admin.opam
+++ b/opam-admin.opam
@@ -18,5 +18,5 @@ bug-reports: "/~https://github.com/ocaml/opam/issues"
 depends: [
   "dune" {>= "1.11.0"}
   "re" {>= "1.9.0"}
-  "opam-file-format" {>= "2.1.2"}
+  "opam-file-format" {>= "2.1.3"}
 ]
diff --git a/opam-format.opam b/opam-format.opam
index b3ab2cbc1fd..a1505118e4e 100644
--- a/opam-format.opam
+++ b/opam-format.opam
@@ -27,7 +27,7 @@ build: [
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-core" {= version}
-  "opam-file-format" {>= "2.1.2"}
+  "opam-file-format" {>= "2.1.3"}
   "re" {>= "1.9.0"}
   "dune" {>= "1.11.0"}
 ]