Merge remote-tracking branch 'origin/stable/cobalt' into stable/nickel

dune-project

@@ -34,7 +34,9 @@
   "camlp5"
   "camlp-streams"
   ("conf-llvm" (>= 11.0.0)) ; note: includes depexts
-  ("conf-libclang" (and (>= 11) ( = :conf-llvm:version))) ; note: includes depexts
+  ("conf-libclang-cpp" (>= 11.0.0))
+     ; conf-libclang-cpp:version should be equal to conf-llvm:version but
+     ; this can't be enforced through opam dependencies yet
   "conf-cmake" ; note: includes depexts
  )
  (tags ("formal specification" "C++" "plugins" "ACSL" "ACSL++"))

frama-clang.opam

@@ -8,7 +8,7 @@ depends: [
   "camlp5"
   "camlp-streams"
   "conf-llvm" {>= "11.0.0"}
-  "conf-libclang" {>= "11" & = conf-llvm:version}
+  "conf-libclang-cpp" {>= "11.0.0"}
   "conf-cmake"
   "odoc" {with-doc}
 ]
@@ -29,7 +29,7 @@ build: [
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
 name: "frama-clang"
-version: "0.0.13"
+version: "0.0.14"
 synopsis: "Frama-C plug-in based on Clang for parsing C++ files"
 description: """
 This Frama-C plug-in parse C++ files that may content ACSL++ annotations.
@@ -41,6 +41,3 @@ authors: [
 license: "LGPL-2.1-only"
 homepage: "https://frama-c.com/frama-clang.html"
 bug-reports: "https://git.frama-c.com/pub/frama-clang"
-
-messages: [
-]

frama-clang.opam.template

 name: "frama-clang"
-version: "0.0.13"
+version: "0.0.14"
 synopsis: "Frama-C plug-in based on Clang for parsing C++ files"
 description: """
 This Frama-C plug-in parse C++ files that may content ACSL++ annotations.
@@ -11,6 +11,3 @@ authors: [
 license: "LGPL-2.1-only"
 homepage: "https://frama-c.com/frama-clang.html"
 bug-reports: "https://git.frama-c.com/pub/frama-clang"
-
-messages: [
-]