17 files changed, 40 insertions, 64 deletions
diff --git a/plugins/btauto/dune b/plugins/btauto/dune
index d2f5b65980..f7b3477460 100644
--- a/plugins/btauto/dune
+++ b/plugins/btauto/dune
@@ -1,7 +1,7 @@
 (library
  (name btauto_plugin)
- (public_name coq.plugins.btauto)
+ (public_name coq-core.plugins.btauto)
  (synopsis "Coq's btauto plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_btauto))
diff --git a/plugins/cc/dune b/plugins/cc/dune
index f7fa3adb56..ee28148c5a 100644
--- a/plugins/cc/dune
+++ b/plugins/cc/dune
@@ -1,7 +1,7 @@
 (library
  (name cc_plugin)
- (public_name coq.plugins.cc)
+ (public_name coq-core.plugins.cc)
  (synopsis "Coq's congruence closure plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_congruence))
diff --git a/plugins/derive/dune b/plugins/derive/dune
index 1931339471..d382031a58 100644
--- a/plugins/derive/dune
+++ b/plugins/derive/dune
@@ -1,7 +1,7 @@
 (library
  (name derive_plugin)
- (public_name coq.plugins.derive)
+ (public_name coq-core.plugins.derive)
  (synopsis "Coq's derive plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_derive))
diff --git a/plugins/extraction/dune b/plugins/extraction/dune
index d9d675fe6a..7f2582f84e 100644
--- a/plugins/extraction/dune
+++ b/plugins/extraction/dune
@@ -1,7 +1,7 @@
 (library
  (name extraction_plugin)
- (public_name coq.plugins.extraction)
+ (public_name coq-core.plugins.extraction)
  (synopsis "Coq's extraction plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_extraction))
diff --git a/plugins/firstorder/dune b/plugins/firstorder/dune
index 1b05452d8f..0299ca802f 100644
--- a/plugins/firstorder/dune
+++ b/plugins/firstorder/dune
@@ -1,7 +1,7 @@
 (library
  (name ground_plugin)
- (public_name coq.plugins.firstorder)
+ (public_name coq-core.plugins.firstorder)
  (synopsis "Coq's first order logic solver plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_ground))
diff --git a/plugins/funind/dune b/plugins/funind/dune
index e594ffbd02..42377f37f4 100644
--- a/plugins/funind/dune
+++ b/plugins/funind/dune
@@ -1,7 +1,7 @@
 (library
  (name recdef_plugin)
- (public_name coq.plugins.funind)
+ (public_name coq-core.plugins.funind)
  (synopsis "Coq's functional induction plugin")
- (libraries coq.plugins.extraction))
+ (libraries coq-core.plugins.extraction))
 
 (coq.pp (modules g_indfun))
diff --git a/plugins/ltac/dune b/plugins/ltac/dune
index 6558ecbfe8..9ec2b10873 100644
--- a/plugins/ltac/dune
+++ b/plugins/ltac/dune
@@ -1,15 +1,15 @@
 (library
  (name ltac_plugin)
- (public_name coq.plugins.ltac)
+ (public_name coq-core.plugins.ltac)
  (synopsis "Coq's LTAC tactic language")
  (modules :standard \ tauto)
- (libraries coq.stm))
+ (libraries coq-core.stm))
 
 (library
  (name tauto_plugin)
- (public_name coq.plugins.tauto)
+ (public_name coq-core.plugins.tauto)
  (synopsis "Coq's tauto tactic")
  (modules tauto)
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules extratactics g_tactic  g_rewrite g_eqdecide g_auto g_obligations g_ltac profile_ltac_tactics coretactics g_class extraargs))
diff --git a/plugins/micromega/dune b/plugins/micromega/dune
index 204125ab56..41f894bce3 100644
--- a/plugins/micromega/dune
+++ b/plugins/micromega/dune
@@ -1,24 +1,24 @@
 (library
  (name micromega_plugin)
- (public_name coq.plugins.micromega)
+ (public_name coq-core.plugins.micromega)
  ; be careful not to link the executable to the plugin!
  (modules (:standard \ csdpcert g_zify zify))
  (synopsis "Coq's micromega plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (executable
  (name csdpcert)
  (public_name csdpcert)
- (package coq)
+ (package coq-core)
  (modules csdpcert)
  (flags :standard -open Micromega_plugin)
- (libraries coq.plugins.micromega))
+ (libraries coq-core.plugins.micromega))
 
 (library
  (name zify_plugin)
- (public_name coq.plugins.zify)
+ (public_name coq-core.plugins.zify)
  (modules g_zify zify)
  (synopsis "Coq's zify plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_micromega g_zify))
diff --git a/plugins/nsatz/dune b/plugins/nsatz/dune
index 3b67ab3429..2aaeec2665 100644
--- a/plugins/nsatz/dune
+++ b/plugins/nsatz/dune
@@ -1,7 +1,7 @@
 (library
  (name nsatz_plugin)
- (public_name coq.plugins.nsatz)
+ (public_name coq-core.plugins.nsatz)
  (synopsis "Coq's nsatz solver plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_nsatz))
diff --git a/plugins/omega/dune b/plugins/omega/dune
index 0db71ed6fb..a3c9342322 100644
--- a/plugins/omega/dune
+++ b/plugins/omega/dune
@@ -1,7 +1,7 @@
 (library
  (name omega_plugin)
- (public_name coq.plugins.omega)
+ (public_name coq-core.plugins.omega)
  (synopsis "Coq's omega plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_omega))
diff --git a/plugins/ring/dune b/plugins/ring/dune
index 080d8c672e..40f310831a 100644
--- a/plugins/ring/dune
+++ b/plugins/ring/dune
@@ -1,7 +1,7 @@
 (library
  (name ring_plugin)
- (public_name coq.plugins.ring)
+ (public_name coq-core.plugins.ring)
  (synopsis "Coq's ring plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_ring))
diff --git a/plugins/rtauto/dune b/plugins/rtauto/dune
index 43efa0eca5..a13f063550 100644
--- a/plugins/rtauto/dune
+++ b/plugins/rtauto/dune
@@ -1,7 +1,7 @@
 (library
  (name rtauto_plugin)
- (public_name coq.plugins.rtauto)
+ (public_name coq-core.plugins.rtauto)
  (synopsis "Coq's rtauto plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_rtauto))
diff --git a/plugins/ssr/dune b/plugins/ssr/dune
index a117d09a16..4c28776bb7 100644
--- a/plugins/ssr/dune
+++ b/plugins/ssr/dune
@@ -1,9 +1,9 @@
 (library
  (name ssreflect_plugin)
- (public_name coq.plugins.ssreflect)
+ (public_name coq-core.plugins.ssreflect)
  (synopsis "Coq's ssreflect plugin")
  (modules_without_implementation ssrast)
  (flags :standard -open Gramlib)
- (libraries coq.plugins.ssrmatching))
+ (libraries coq-core.plugins.ssrmatching))
 
 (coq.pp (modules ssrvernac ssrparser))
diff --git a/plugins/ssrmatching/dune b/plugins/ssrmatching/dune
index 629d723816..efaa09c939 100644
--- a/plugins/ssrmatching/dune
+++ b/plugins/ssrmatching/dune
@@ -1,7 +1,7 @@
 (library
  (name ssrmatching_plugin)
- (public_name coq.plugins.ssrmatching)
+ (public_name coq-core.plugins.ssrmatching)
  (synopsis "Coq ssrmatching plugin")
- (libraries coq.plugins.ltac))
+ (libraries coq-core.plugins.ltac))
 
 (coq.pp (modules g_ssrmatching))
diff --git a/plugins/ssrsearch/dune b/plugins/ssrsearch/dune
index 2851835eae..a38bec496f 100644
--- a/plugins/ssrsearch/dune
+++ b/plugins/ssrsearch/dune
@@ -1,7 +1,7 @@
 (library
  (name ssrsearch_plugin)
- (public_name coq.plugins.ssrsearch)
+ (public_name coq-core.plugins.ssrsearch)
  (synopsis "Deprecated Search command from SSReflect")
- (libraries coq.plugins.ssreflect))
+ (libraries coq-core.plugins.ssreflect))
 
 (coq.pp (modules g_search))
diff --git a/plugins/syntax/dune b/plugins/syntax/dune
index ba53a439a0..b00242be1a 100644
--- a/plugins/syntax/dune
+++ b/plugins/syntax/dune
@@ -1,15 +1,15 @@
 (library
  (name number_string_notation_plugin)
- (public_name coq.plugins.number_string_notation)
+ (public_name coq-core.plugins.number_string_notation)
  (synopsis "Coq number and string notation plugin")
  (modules g_number_string string_notation number)
- (libraries coq.vernac))
+ (libraries coq-core.vernac))
 
 (library
  (name float_syntax_plugin)
- (public_name coq.plugins.float_syntax)
+ (public_name coq-core.plugins.float_syntax)
  (synopsis "Coq syntax plugin: float")
  (modules float_syntax)
- (libraries coq.vernac))
+ (libraries coq-core.vernac))
 
 (coq.pp (modules g_number_string))
diff --git a/plugins/syntax/number.ml b/plugins/syntax/number.ml
index 80c11dc0d4..551e2bac5d 100644
--- a/plugins/syntax/number.ml
+++ b/plugins/syntax/number.ml
@@ -131,13 +131,6 @@ let type_error_of g ty =
      str " to Number.int or (option Number.int)." ++ fnl () ++
      str "Instead of Number.int, the types Number.uint or Z or PrimInt63.pos_neg_int63 or Number.number could be used (you may need to require BinNums or Number or PrimInt63 first).")
 
-let warn_deprecated_decimal =
-  CWarnings.create ~name:"decimal-numeral-notation" ~category:"deprecated"
-    (fun () ->
-      strbrk "Deprecated Number Notation for Decimal.uint, \
-              Decimal.int or Decimal.decimal. Use Number.uint, \
-              Number.int or Number.number respectively.")
-
 let error_params ind =
   CErrors.user_err
     (str "Wrong number of parameters for inductive" ++ spc ()
@@ -456,12 +449,6 @@ let vernac_number_notation local ty f g opts scope =
     | Some (int_ty, _, cuint, _, _, _, _, _) when has_type env sigma f (arrow cuint (opt cty)) -> UInt int_ty, Option
     | Some (_, _, _, _, _, num_ty, cnum, _) when has_type env sigma f (arrow cnum cty) -> Number num_ty, Direct
     | Some (_, _, _, _, _, num_ty, cnum, _) when has_type env sigma f (arrow cnum (opt cty)) -> Number num_ty, Option
-    | Some (int_ty, _, _, cint, _, _, _, _) when has_type env sigma f (arrow cint cty) -> DecimalInt int_ty, Direct
-    | Some (int_ty, _, _, cint, _, _, _, _) when has_type env sigma f (arrow cint (opt cty)) -> DecimalInt int_ty, Option
-    | Some (int_ty, _, _, _, cuint, _, _, _) when has_type env sigma f (arrow cuint cty) -> DecimalUInt int_ty, Direct
-    | Some (int_ty, _, _, _, cuint, _, _, _) when has_type env sigma f (arrow cuint (opt cty)) -> DecimalUInt int_ty, Option
-    | Some (_, _, _, _, _, num_ty, _, cdec) when has_type env sigma f (arrow cdec cty) -> Decimal num_ty, Direct
-    | Some (_, _, _, _, _, num_ty, _, cdec) when has_type env sigma f (arrow cdec (opt cty)) -> Decimal num_ty, Option
     | _ ->
     match z_pos_ty with
     | Some (z_pos_ty, cZ) when has_type env sigma f (arrow cZ cty) -> Z z_pos_ty, Direct
@@ -484,12 +471,6 @@ let vernac_number_notation local ty f g opts scope =
     | Some (int_ty, _, cuint, _, _, _, _, _) when has_type env sigma g (arrow cty (opt cuint)) -> UInt int_ty, Option
     | Some (_, _, _, _, _, num_ty, cnum, _) when has_type env sigma g (arrow cty cnum) -> Number num_ty, Direct
     | Some (_, _, _, _, _, num_ty, cnum, _) when has_type env sigma g (arrow cty (opt cnum)) -> Number num_ty, Option
-    | Some (int_ty, _, _, cint, _, _, _, _) when has_type env sigma g (arrow cty cint) -> DecimalInt int_ty, Direct
-    | Some (int_ty, _, _, cint, _, _, _, _) when has_type env sigma g (arrow cty (opt cint)) -> DecimalInt int_ty, Option
-    | Some (int_ty, _, _, _, cuint, _, _, _) when has_type env sigma g (arrow cty cuint) -> DecimalUInt int_ty, Direct
-    | Some (int_ty, _, _, _, cuint, _, _, _) when has_type env sigma g (arrow cty (opt cuint)) -> DecimalUInt int_ty, Option
-    | Some (_, _, _, _, _, num_ty, _, cdec) when has_type env sigma g (arrow cty cdec) -> Decimal num_ty, Direct
-    | Some (_, _, _, _, _, num_ty, _, cdec) when has_type env sigma g (arrow cty (opt cdec)) -> Decimal num_ty, Option
     | _ ->
     match z_pos_ty with
     | Some (z_pos_ty, cZ) when has_type env sigma g (arrow cty cZ) -> Z z_pos_ty, Direct
@@ -500,11 +481,6 @@ let vernac_number_notation local ty f g opts scope =
     | Some (pos_neg_int63_ty, cint63) when has_type env sigma g (arrow cty (opt cint63)) -> Int63 pos_neg_int63_ty, Option
     | _ -> type_error_of g ty
   in
-  (match to_kind, of_kind with
-   | ((DecimalInt _ | DecimalUInt _ | Decimal _), _), _
-   | _, ((DecimalInt _ | DecimalUInt _ | Decimal _), _) ->
-      warn_deprecated_decimal ()
-   | _ -> ());
   let to_post, pt_required, pt_refs = match tyc_params with
     | TargetPrim path -> [||], path, [Coqlib.lib_ref "num.int63.wrap_int"]
     | TargetInd (tyc, params) ->