diff -Nru apron-0.9.10/debian/changelog apron-0.9.10/debian/changelog --- apron-0.9.10/debian/changelog 2016-07-14 18:16:56.000000000 +0000 +++ apron-0.9.10/debian/changelog 2016-08-03 14:47:13.000000000 +0000 @@ -1,3 +1,23 @@ +apron (0.9.10-9) unstable; urgency=medium + + * Team upload. + * Make libapron-dev depend on libapron (Closes: #715070) + * Bump Standards-Version to 3.9.8 + * debian/control: Use canonical, HTTPS URLs + * debian/copyright: Update + - Switch to fomat 1.0 + - Fix syntax errors + - Fix license information on some files + * debian/rules: Fail on non-installed files + * Use build-time hardening + * Install all shlib symlinks in libapron-dev + This required a package transition + * Fix typos in documentation & binaries + Add patch 0010-Fix-typos.patch + * Add doc-base files + + -- Nicolas Braud-Santoni Wed, 03 Aug 2016 16:47:13 +0200 + apron (0.9.10-8) unstable; urgency=medium * Team upload diff -Nru apron-0.9.10/debian/control apron-0.9.10/debian/control --- apron-0.9.10/debian/control 2016-07-14 18:16:56.000000000 +0000 +++ apron-0.9.10/debian/control 2016-08-03 14:45:56.000000000 +0000 @@ -12,10 +12,10 @@ libmpfr-dev, libppl-dev, texi2html (>= 1.82) -Standards-Version: 3.9.0 +Standards-Version: 3.9.8 Homepage: http://apron.cri.ensmp.fr/library/ -Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/apron.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/apron.git +Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/apron.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ocaml-maint/packages/apron.git Package: libapron Section: libs @@ -34,6 +34,7 @@ Package: libapron-dev Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, + libapron, libgmp3-dev, libmpfr-dev, libppl-dev diff -Nru apron-0.9.10/debian/copyright apron-0.9.10/debian/copyright --- apron-0.9.10/debian/copyright 2016-07-14 18:16:56.000000000 +0000 +++ apron-0.9.10/debian/copyright 2016-08-03 14:45:56.000000000 +0000 @@ -1,79 +1,68 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=179 +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Packaged-By: Samuel Mimram Packaged-Date: Wed Oct 21 19:11:16 CEST 2009 Upstream-Source: http://apron.cri.ensmp.fr/library/ -Upstream-Maintainer: Bertand Jeannet and Antoine Miné +Upstream-Contact: Bertand Jeannet and Antoine Miné Files: apron/* Copyright: © 2005-2009 Bertrand Jeannet and Antoine Miné License: LGPL-2.1+ +Files: apron/apronxx/apronxx_test.cc + apron/apronxx/apxx_ppl.hh + apron/apronxx/apxx_ppl_inline.hh + apron/apronxx/apxx_ppl_product.hh + apron/apronxx/apxx_ppl_product_inline.hh +Copyright: © 2007-2009 Antoine Miné +License: GPL-2+ + +Files: apron/ppl/* +Copyright: © 2006-2009 Antoine Miné +License: GPL-2+ + +Files: apron/ppl/ap_ppl.texi +Copyright: © 2006-2009 Antoine Miné +License: LGPL-2.1+ + +Files: apron/test/* +Copyright: © 2005-2009 Bertrand Jeannet and Antoine Miné +License: GPL-2+ + +Files: mlgmpidl/* +Copyright: © 2005-2009 Bertrand Jeannet +License: LGPL-2.1+ + +Files: debian/* +Copyright: © 2009 Samuel Mimram +License: GPL-2+ + + +License: LGPL-2.1+ + . This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + . This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + . The complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. -Files: apron/apron/* -Copyright: © 2005-2009 Bertrand Jeannet - -Files: apron/apronxx/* -Copyright: © 2007-2009 Antoine Miné - -Files: apron/apronxx/apronxx_test.cc, - apron/apronxx/apxx_ppl.hh, - apron/apronxx/apxx_ppl_inline.hh, - apron/apronxx/apxx_ppl_product.hh, - apron/apronxx/apxx_ppl_product_inline.hh -Copyright: © 2007-2009 Antoine Miné License: GPL-2+ - + . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + . The complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. - -Files: apron/box/* -Copyright: © 2006-2009 Bertrand Jeannet - -Files: apron/itv/* -Copyright: © 2006-2009 Bertrand Jeannet and Antoine Miné - -Files: apron/mlapronidl/* -Copyright: © 2005-2009 Bertrand Jeannet - -Files: apron/newpolka/* -Copyright: © 1999-2009 Bertrand Jeannet - -Files: apron/octagons/* -Copyright: © 2006-2009 Antoine Miné - -Files: apron/ppl/* -Copyright: © 2006-2009 Antoine Miné -License: GPL-2+ - -Files: apron/test/* -Copyright: © 2005-2009 Bertrand Jeannet and Antoine Miné -License: GPL-2+ - -Files: mlgmpidl/* -Copyright: © 2005-2009 Bertrand Jeannet - -Files: debian/* -Copyright: © 2009 Samuel Mimram -License: GPL-2+ diff -Nru apron-0.9.10/debian/libapron-dev.doc-base apron-0.9.10/debian/libapron-dev.doc-base --- apron-0.9.10/debian/libapron-dev.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ apron-0.9.10/debian/libapron-dev.doc-base 2016-08-03 14:45:56.000000000 +0000 @@ -0,0 +1,8 @@ +Document: apron +Title: The APRON library +Author: Bertrand Jeannet and the APRON team +Section: Programming/C + +Format: HTML +Index: /usr/share/doc/libapron-dev/html/apron.html +Files: /usr/share/doc/libapron-dev/html/*.html diff -Nru apron-0.9.10/debian/libapron-dev.install apron-0.9.10/debian/libapron-dev.install --- apron-0.9.10/debian/libapron-dev.install 2016-07-14 18:16:56.000000000 +0000 +++ apron-0.9.10/debian/libapron-dev.install 2016-08-03 14:45:56.000000000 +0000 @@ -1,3 +1,5 @@ +usr/lib/libap_pkgrid.so +usr/lib/libap_ppl.so usr/lib/libapron.so usr/lib/libboxD.so usr/lib/libboxMPFR.so diff -Nru apron-0.9.10/debian/libapron-ocaml-dev.doc-base apron-0.9.10/debian/libapron-ocaml-dev.doc-base --- apron-0.9.10/debian/libapron-ocaml-dev.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ apron-0.9.10/debian/libapron-ocaml-dev.doc-base 2016-08-03 14:45:56.000000000 +0000 @@ -0,0 +1,8 @@ +Document: apron-ocaml +Title: The APRON library +Author: Bertrand Jeannet and the APRON team +Section: Programming/OCaml + +Format: HTML +Index: /usr/share/doc/libapron-ocaml-dev/html/index.html +Files: /usr/share/doc/libapron-ocaml-dev/html/*.html diff -Nru apron-0.9.10/debian/patches/0010-Fix-typos.patch apron-0.9.10/debian/patches/0010-Fix-typos.patch --- apron-0.9.10/debian/patches/0010-Fix-typos.patch 1970-01-01 00:00:00.000000000 +0000 +++ apron-0.9.10/debian/patches/0010-Fix-typos.patch 2016-08-03 14:45:56.000000000 +0000 @@ -0,0 +1,909 @@ +Subject: Fix typos + +--- + apron/apron/ap_abstract1.c | 8 ++++---- + apron/mlapronidl/abstract1.idl | 4 ++-- + apron/mlapronidl/abstract1.mli | 4 ++-- + apron/mlapronidl/environment.idl | 2 +- + apron/mlapronidl/environment.mli | 2 +- + apron/mlapronidl/generator1.idl | 16 ++++++++-------- + apron/mlapronidl/generator1.mli | 16 ++++++++-------- + apron/mlapronidl/lincons1.idl | 16 ++++++++-------- + apron/mlapronidl/lincons1.mli | 16 ++++++++-------- + apron/mlapronidl/linexpr1.idl | 4 ++-- + apron/mlapronidl/linexpr1.mli | 4 ++-- + apron/mlapronidl/tcons1.idl | 16 ++++++++-------- + apron/mlapronidl/tcons1.mli | 16 ++++++++-------- + apron/mlapronidl/texpr1.idl | 4 ++-- + apron/mlapronidl/texpr1.mli | 4 ++-- + apron/octagons/tmp/abstract1.idl | 4 ++-- + apron/octagons/tmp/environment.idl | 2 +- + apron/octagons/tmp/generator1.idl | 16 ++++++++-------- + apron/octagons/tmp/lincons1.idl | 16 ++++++++-------- + apron/octagons/tmp/linexpr1.idl | 4 ++-- + apron/octagons/tmp/tcons1.idl | 16 ++++++++-------- + apron/octagons/tmp/texpr1.idl | 4 ++-- + 22 files changed, 97 insertions(+), 97 deletions(-) + +diff --git a/apron/apron/ap_abstract1.c b/apron/apron/ap_abstract1.c +index a5ad420..c1af128 100644 +From: Nicolas Braud-Santoni +Reviewed-by: Nicolas Braud-Santoni +Last-Update: 2016-07-23 +Forwarded: 2016-08-01, by mail to and +Applied-Upstream: yes + +--- a/apron/apron/ap_abstract1.c ++++ b/apron/apron/ap_abstract1.c +@@ -125,7 +125,7 @@ bool ap_abstract1_check_env_array(ap_funid_t funid,ap_manager_t* man, + + char str[160]; + snprintf(str,159,"The %luth abstract value of the array has not \ +-the same environement as the 0th abstract value\ ++the same environment as the 0th abstract value\ + ",(unsigned long)i); + ap_manager_raise_exception(man, + AP_EXC_INVALID_ARGUMENT, +@@ -273,7 +273,7 @@ void ap_abstract1_fprintdiff(FILE* stream, + ap_environment_name_of_dim_t* name_of_dim; + if (!ap_environment_is_eq(a1->env,a2->env)){ + ap_manager_raise_exception(man,AP_EXC_INVALID_ARGUMENT,AP_FUNID_FPRINTDIFF, +- "the 2 abstract values are not defined on the same environement"); ++ "the 2 abstract values are not defined on the same environment"); + fprintf(stream,"unknown diff\n"); + } + name_of_dim = ap_environment_name_of_dim_alloc(a1->env); +@@ -341,7 +341,7 @@ ap_abstract1_t ap_abstract1_top(ap_manager_t* man, ap_environment_t* env) + /* Abstract an hypercube defined by the arrays tvar and tinterval, + satisfying: forall i, tvar[i] in tinterval[i]. + +- If no inclusion is specified for a variable in the environement, its value ++ If no inclusion is specified for a variable in the environment, its value + is no constrained in the resulting abstract value. + */ + ap_abstract1_t ap_abstract1_of_box(ap_manager_t* man, +@@ -1176,7 +1176,7 @@ ap_abstract1_t ap_abstract1_fold(ap_manager_t* man, + nenv = ap_environment_remove(a->env, &tvar[1], size-1); + if (nenv==NULL){ + ap_manager_raise_exception(man,AP_EXC_INVALID_ARGUMENT,AP_FUNID_FOLD, +- "some variables to fold are unkown in the environment"); ++ "some variables to fold are unknown in the environment"); + goto ap_abstract1_fold_exit; + } + /* Translate variables to dimensions */ +diff --git a/apron/mlapronidl/abstract1.idl b/apron/mlapronidl/abstract1.idl +index 027d1e4..3b4b666 100644 +--- a/apron/mlapronidl/abstract1.idl ++++ b/apron/mlapronidl/abstract1.idl +@@ -470,7 +470,7 @@ quote(MLMLI,"(* ============================================================ *)" + quote(MLMLI,"(** {3 Change and permutation of dimensions} *)\n") + quote(MLMLI,"(* ============================================================ *)") + +-quote(MLI,"(** Change the environement of the abstract values.\n\nVariables that are removed are first existentially quantified, and variables that are introduced are unconstrained. The Boolean, if true, adds a projection onto 0-plane for these ones. *)") ++quote(MLI,"(** Change the environment of the abstract values.\n\nVariables that are removed are first existentially quantified, and variables that are introduced are unconstrained. The Boolean, if true, adds a projection onto 0-plane for these ones. *)") + struct ap_abstract1_t ap_abstract1_change_environment(ap_manager_ptr man, + [ref]struct ap_abstract1_t* a, + ap_environment_ptr v1, +@@ -574,7 +574,7 @@ quote(MLI,"(** \ + It results in (n+1) unrelated variables having\n \ + same relations with other variables. The additional variables are added to the environment of \n\ + the argument for making the environment of the result, so they should\n\ +- not belong to the initial environement.\n\ ++ not belong to the initial environment.\n\ + *)") + struct ap_abstract1_t ap_abstract1_expand(ap_manager_ptr man, [ref]struct ap_abstract1_t* a, + ap_var_t v1, +diff --git a/apron/mlapronidl/abstract1.mli b/apron/mlapronidl/abstract1.mli +index ee75947..9fc3cf2 100644 +--- a/apron/mlapronidl/abstract1.mli ++++ b/apron/mlapronidl/abstract1.mli +@@ -273,7 +273,7 @@ external forget_array_with : 'a Manager.t -> 'a t -> Var.t array -> bool -> unit + (** {3 Change and permutation of dimensions} *) + + (* ============================================================ *) +-(** Change the environement of the abstract values. ++(** Change the environment of the abstract values. + + Variables that are removed are first existentially quantified, and variables that are introduced are unconstrained. The Boolean, if true, adds a projection onto 0-plane for these ones. *) + external change_environment : 'a Manager.t -> 'a t -> Environment.t -> bool -> 'a t +@@ -320,7 +320,7 @@ if z and w are folded onto z + It results in (n+1) unrelated variables having + same relations with other variables. The additional variables are added to the environment of + the argument for making the environment of the result, so they should +-not belong to the initial environement. ++not belong to the initial environment. + *) + external expand : 'a Manager.t -> 'a t -> Var.t -> Var.t array -> 'a t + = "camlidl_abstract1_ap_abstract1_expand" +diff --git a/apron/mlapronidl/environment.idl b/apron/mlapronidl/environment.idl +index bc2c1f4..ba94695 100644 +--- a/apron/mlapronidl/environment.idl ++++ b/apron/mlapronidl/environment.idl +@@ -210,7 +210,7 @@ boolean ap_environment_equal(ap_environment_ptr env1, + _res = ap_environment_is_eq(env1,env2);\n\ + "); + +-quote(MLI,"\n(** Compare two environment. [compare env1 env2] return [-2] if the environements are not compatible (a variable has different types in the 2 environements), [-1] if [env1] is a subset of env2, [0] if equality, [+1] if env1 is a superset of env2, and [+2] otherwise (the lce exists and is a strict superset of both) *)") ++quote(MLI,"\n(** Compare two environment. [compare env1 env2] return [-2] if the environments are not compatible (a variable has different types in the 2 environments), [-1] if [env1] is a subset of env2, [0] if equality, [+1] if env1 is a superset of env2, and [+2] otherwise (the lce exists and is a strict superset of both) *)") + int ap_environment_compare(ap_environment_ptr env1, + ap_environment_ptr env2); + +diff --git a/apron/mlapronidl/environment.mli b/apron/mlapronidl/environment.mli +index 6bba63b..c7de39a 100644 +--- a/apron/mlapronidl/environment.mli ++++ b/apron/mlapronidl/environment.mli +@@ -79,7 +79,7 @@ external equal : t -> t -> bool + = "camlidl_environment_ap_environment_equal" + + +-(** Compare two environment. [compare env1 env2] return [-2] if the environements are not compatible (a variable has different types in the 2 environements), [-1] if [env1] is a subset of env2, [0] if equality, [+1] if env1 is a superset of env2, and [+2] otherwise (the lce exists and is a strict superset of both) *) ++(** Compare two environment. [compare env1 env2] return [-2] if the environments are not compatible (a variable has different types in the 2 environments), [-1] if [env1] is a subset of env2, [0] if equality, [+1] if env1 is a superset of env2, and [+2] otherwise (the lce exists and is a strict superset of both) *) + external compare : t -> t -> int + = "camlidl_environment_ap_environment_compare" + +diff --git a/apron/mlapronidl/generator1.idl b/apron/mlapronidl/generator1.idl +index 9bee426..3ab4d0c 100644 +--- a/apron/mlapronidl/generator1.idl ++++ b/apron/mlapronidl/generator1.idl +@@ -40,7 +40,7 @@ type typ = Generator0.typ = \n\ + quote(MLI,"\n\ + (** Make a generator. Modifying later the linear expression ({e not\n\ + advisable}) modifies correspondingly the generator and conversely,\n\ +- except for changes of environements *)\n\ ++ except for changes of environments *)\n\ + val make: Linexpr1.t -> Generator0.typ -> t\n\ + \n\ + (** Copy (deep copy) *)\n\ +@@ -107,7 +107,7 @@ void ap_generator1_set_coeff([ref]struct ap_generator1_t* a, ap_var_t var, + }\n\ + }"); + +-quote(MLI,"(** Change the environement of the generator for a super-environement. Raise [Failure] if it is not the case *)") ++quote(MLI,"(** Change the environment of the generator for a super-environment. Raise [Failure] if it is not the case *)") + struct ap_generator1_t ap_generator1_extend_environment(const struct ap_generator1_t generator, + ap_environment_ptr env) + quote(call,"\n\ +@@ -184,7 +184,7 @@ quote(MLMLI,"(* ================================================================ + + quote(MLI,"\n\ + (** Make an array of generators with the given size and defined on the\n\ +- given environement. The elements are initialized with the line 0. *)\n\ ++ given environment. The elements are initialized with the line 0. *)\n\ + val array_make : Environment.t -> int -> earray\n\ + \n\ + (** Print an array of generators *)\n\ +@@ -201,12 +201,12 @@ val array_length : earray -> int\n\ + val array_get : earray -> int -> t\n\ + \n\ + (** Set the element of the given index (without any copy). The array and the\n\ +- generator should be defined on the same environement; otherwise a [Failure]\n\ ++ generator should be defined on the same environment; otherwise a [Failure]\n\ + exception is raised.*)\n\ + val array_set : earray -> int -> t -> unit\n\ + ") + +-quote(MLI,"(** Change the environement of the array of generators for a super-environement. Raise [Failure] if it is not the case*)") ++quote(MLI,"(** Change the environment of the array of generators for a super-environment. Raise [Failure] if it is not the case*)") + struct ap_generator1_array_t ap_generator1_array_extend_environment(const struct ap_generator1_array_t array, + ap_environment_ptr env) + quote(call,"\n\ +@@ -236,17 +236,17 @@ void ap_generator1_array_extend_environment_with(struct ap_generator1_array_t ar + ; + + quote(MLI,"\n\ +-(** Get the environement of the generator *)\n\ ++(** Get the environment of the generator *)\n\ + val get_env: t -> Environment.t\n\ + \n\ + (** Get the underlying linear expression. Modifying the linear expression ({e\n\ + not advisable}) modifies correspondingly the generator and\n\ +- conversely, except for changes of environements *)\n\ ++ conversely, except for changes of environments *)\n\ + val get_linexpr1: t -> Linexpr1.t\n\ + \n\ + (** Get the underlying generator of level 0. Modifying the generator\n\ + of level 0 ({e not advisable}) modifies correspondingly the generator\n\ +- and conversely, except for changes of environements*)\n\ ++ and conversely, except for changes of environments*)\n\ + val get_generator0: t -> Generator0.t\n\ + ") + +diff --git a/apron/mlapronidl/generator1.mli b/apron/mlapronidl/generator1.mli +index e6f6609..624106b 100644 +--- a/apron/mlapronidl/generator1.mli ++++ b/apron/mlapronidl/generator1.mli +@@ -24,7 +24,7 @@ type typ = Generator0.typ = + + (** Make a generator. Modifying later the linear expression ({e not + advisable}) modifies correspondingly the generator and conversely, +-except for changes of environements *) ++except for changes of environments *) + val make: Linexpr1.t -> Generator0.typ -> t + + (** Copy (deep copy) *) +@@ -61,7 +61,7 @@ external get_coeff : t -> Var.t -> Coeff.t + external set_coeff : t -> Var.t -> Coeff.t -> unit + = "camlidl_generator1_ap_generator1_set_coeff" + +-(** Change the environement of the generator for a super-environement. Raise [Failure] if it is not the case *) ++(** Change the environment of the generator for a super-environment. Raise [Failure] if it is not the case *) + external extend_environment : t -> Environment.t -> t + = "camlidl_generator1_ap_generator1_extend_environment" + +@@ -74,7 +74,7 @@ external extend_environment_with : t -> Environment.t -> unit + (* ====================================================================== *) + + (** Make an array of generators with the given size and defined on the +-given environement. The elements are initialized with the line 0. *) ++given environment. The elements are initialized with the line 0. *) + val array_make : Environment.t -> int -> earray + + (** Print an array of generators *) +@@ -91,11 +91,11 @@ val array_length : earray -> int + val array_get : earray -> int -> t + + (** Set the element of the given index (without any copy). The array and the +-generator should be defined on the same environement; otherwise a [Failure] ++generator should be defined on the same environment; otherwise a [Failure] + exception is raised.*) + val array_set : earray -> int -> t -> unit + +-(** Change the environement of the array of generators for a super-environement. Raise [Failure] if it is not the case*) ++(** Change the environment of the array of generators for a super-environment. Raise [Failure] if it is not the case*) + external array_extend_environment : earray -> Environment.t -> earray + = "camlidl_generator1_ap_generator1_array_extend_environment" + +@@ -104,16 +104,16 @@ external array_extend_environment_with : earray -> Environment.t -> unit + = "camlidl_generator1_ap_generator1_array_extend_environment_with" + + +-(** Get the environement of the generator *) ++(** Get the environment of the generator *) + val get_env: t -> Environment.t + + (** Get the underlying linear expression. Modifying the linear expression ({e + not advisable}) modifies correspondingly the generator and +-conversely, except for changes of environements *) ++conversely, except for changes of environments *) + val get_linexpr1: t -> Linexpr1.t + + (** Get the underlying generator of level 0. Modifying the generator + of level 0 ({e not advisable}) modifies correspondingly the generator +-and conversely, except for changes of environements*) ++and conversely, except for changes of environments*) + val get_generator0: t -> Generator0.t + +diff --git a/apron/mlapronidl/lincons1.idl b/apron/mlapronidl/lincons1.idl +index 877ffc4..9844aa7 100644 +--- a/apron/mlapronidl/lincons1.idl ++++ b/apron/mlapronidl/lincons1.idl +@@ -40,7 +40,7 @@ type typ = Lincons0.typ =\n\ + quote(MLI,"\n\ + (** Make a linear constraint. Modifying later the linear expression ({e not\n\ + advisable}) modifies correspondingly the linear constraint and conversely,\n\ +- except for changes of environements *)\n\ ++ except for changes of environments *)\n\ + val make: Linexpr1.t -> typ -> t\n\ + \n\ + (** Copy (deep copy) *)\n\ +@@ -122,7 +122,7 @@ struct ap_lincons1_t ap_lincons1_make_unsat(ap_environment_ptr env); + quote(MLI,"(** Is the constraint not satisfiable ? *)") + boolean ap_lincons1_is_unsat([ref]struct ap_lincons1_t* cons); + +-quote(MLI,"(** Change the environement of the constraint for a super-environement. Raise [Failure] if it is not the case *)") ++quote(MLI,"(** Change the environment of the constraint for a super-environment. Raise [Failure] if it is not the case *)") + struct ap_lincons1_t ap_lincons1_extend_environment(const struct ap_lincons1_t lincons, + ap_environment_ptr env) + quote(call,"\n\ +@@ -152,17 +152,17 @@ void ap_lincons1_extend_environment_with(struct ap_lincons1_t lincons, + ; + + quote(MLI,"\n\ +-(** Get the environement of the linear constraint *)\n\ ++(** Get the environment of the linear constraint *)\n\ + val get_env: t -> Environment.t\n\ + \n\ + (** Get the underlying linear expression. Modifying the linear expression ({e\n\ + not advisable}) modifies correspondingly the linear constraint and\n\ +- conversely, except for changes of environements *)\n\ ++ conversely, except for changes of environments *)\n\ + val get_linexpr1: t -> Linexpr1.t\n\ + \n\ + (** Get the underlying linear constraint of level 0. Modifying the constraint\n\ + of level 0 ({e not advisable}) modifies correspondingly the linear constraint\n\ +- and conversely, except for changes of environements*)\n\ ++ and conversely, except for changes of environments*)\n\ + val get_lincons0: t -> Lincons0.t\n\ + \n\ + ") +@@ -226,7 +226,7 @@ quote(MLMLI,"(** {2 Type array} *)") + quote(MLMLI,"(* ====================================================================== *)") + quote(MLI,"\n\ + (** Make an array of linear constraints with the given size and defined on the\n\ +- given environement. The elements are initialized with the constraint 0=0. *)\n\ ++ given environment. The elements are initialized with the constraint 0=0. *)\n\ + val array_make : Environment.t -> int -> earray\n\ + \n\ + (** Print an array of constraints *)\n\ +@@ -246,12 +246,12 @@ val array_get_env : earray -> Environment.t\n\ + val array_get : earray -> int -> t\n\ + \n\ + (** Set the element of the given index (without any copy). The array and the\n\ +- constraint should be defined on the same environement; otherwise a [Failure]\n\ ++ constraint should be defined on the same environment; otherwise a [Failure]\n\ + exception is raised.*)\n\ + val array_set : earray -> int -> t -> unit\n\ + ") + +-quote(MLI,"(** Change the environement of the array of constraints for a super-environement. Raise [Failure] if it is not the case*)") ++quote(MLI,"(** Change the environment of the array of constraints for a super-environment. Raise [Failure] if it is not the case*)") + struct ap_lincons1_array_t ap_lincons1_array_extend_environment(const struct ap_lincons1_array_t array, + ap_environment_ptr env) + quote(call,"\n\ +diff --git a/apron/mlapronidl/lincons1.mli b/apron/mlapronidl/lincons1.mli +index f0b29c2..a161071 100644 +--- a/apron/mlapronidl/lincons1.mli ++++ b/apron/mlapronidl/lincons1.mli +@@ -24,7 +24,7 @@ type typ = Lincons0.typ = + + (** Make a linear constraint. Modifying later the linear expression ({e not + advisable}) modifies correspondingly the linear constraint and conversely, +-except for changes of environements *) ++except for changes of environments *) + val make: Linexpr1.t -> typ -> t + + (** Copy (deep copy) *) +@@ -79,7 +79,7 @@ external make_unsat : Environment.t -> t + external is_unsat : t -> bool + = "camlidl_lincons1_ap_lincons1_is_unsat" + +-(** Change the environement of the constraint for a super-environement. Raise [Failure] if it is not the case *) ++(** Change the environment of the constraint for a super-environment. Raise [Failure] if it is not the case *) + external extend_environment : t -> Environment.t -> t + = "camlidl_lincons1_ap_lincons1_extend_environment" + +@@ -88,17 +88,17 @@ external extend_environment_with : t -> Environment.t -> unit + = "camlidl_lincons1_ap_lincons1_extend_environment_with" + + +-(** Get the environement of the linear constraint *) ++(** Get the environment of the linear constraint *) + val get_env: t -> Environment.t + + (** Get the underlying linear expression. Modifying the linear expression ({e + not advisable}) modifies correspondingly the linear constraint and +-conversely, except for changes of environements *) ++conversely, except for changes of environments *) + val get_linexpr1: t -> Linexpr1.t + + (** Get the underlying linear constraint of level 0. Modifying the constraint + of level 0 ({e not advisable}) modifies correspondingly the linear constraint +-and conversely, except for changes of environements*) ++and conversely, except for changes of environments*) + val get_lincons0: t -> Lincons0.t + + +@@ -107,7 +107,7 @@ val get_lincons0: t -> Lincons0.t + (* ====================================================================== *) + + (** Make an array of linear constraints with the given size and defined on the +-given environement. The elements are initialized with the constraint 0=0. *) ++given environment. The elements are initialized with the constraint 0=0. *) + val array_make : Environment.t -> int -> earray + + (** Print an array of constraints *) +@@ -127,11 +127,11 @@ val array_get_env : earray -> Environment.t + val array_get : earray -> int -> t + + (** Set the element of the given index (without any copy). The array and the +-constraint should be defined on the same environement; otherwise a [Failure] ++constraint should be defined on the same environment; otherwise a [Failure] + exception is raised.*) + val array_set : earray -> int -> t -> unit + +-(** Change the environement of the array of constraints for a super-environement. Raise [Failure] if it is not the case*) ++(** Change the environment of the array of constraints for a super-environment. Raise [Failure] if it is not the case*) + external array_extend_environment : earray -> Environment.t -> earray + = "camlidl_lincons1_ap_lincons1_array_extend_environment" + +diff --git a/apron/mlapronidl/linexpr1.idl b/apron/mlapronidl/linexpr1.idl +index c388229..98434b7 100644 +--- a/apron/mlapronidl/linexpr1.idl ++++ b/apron/mlapronidl/linexpr1.idl +@@ -90,7 +90,7 @@ void ap_linexpr1_set_coeff([ref]struct ap_linexpr1_t* a, ap_var_t var, + }\n\ + "); + +-quote(MLI,"(** Change the environment of the expression for a super-environement. Raise [Failure] if it is not the case *)") ++quote(MLI,"(** Change the environment of the expression for a super-environment. Raise [Failure] if it is not the case *)") + struct ap_linexpr1_t ap_linexpr1_extend_environment(const struct ap_linexpr1_t linexpr, + ap_environment_ptr env) + quote(call,"\n\ +@@ -130,7 +130,7 @@ quote(MLI,"\n\ + (** Get the underlying expression of level 0 (which is not a copy). *)\n\ + val get_linexpr0: t -> Linexpr0.t\n\ + \n\ +-(** Get the environement of the expression *)\n\ ++(** Get the environment of the expression *)\n\ + val get_env: t -> Environment.t\n\ + \n\ + ") +diff --git a/apron/mlapronidl/linexpr1.mli b/apron/mlapronidl/linexpr1.mli +index 22a969e..8b8c7ca 100644 +--- a/apron/mlapronidl/linexpr1.mli ++++ b/apron/mlapronidl/linexpr1.mli +@@ -51,7 +51,7 @@ external get_coeff : t -> Var.t -> Coeff.t + external set_coeff : t -> Var.t -> Coeff.t -> unit + = "camlidl_linexpr1_ap_linexpr1_set_coeff" + +-(** Change the environment of the expression for a super-environement. Raise [Failure] if it is not the case *) ++(** Change the environment of the expression for a super-environment. Raise [Failure] if it is not the case *) + external extend_environment : t -> Environment.t -> t + = "camlidl_linexpr1_ap_linexpr1_extend_environment" + +@@ -71,7 +71,7 @@ external is_real : t -> bool + (** Get the underlying expression of level 0 (which is not a copy). *) + val get_linexpr0: t -> Linexpr0.t + +-(** Get the environement of the expression *) ++(** Get the environment of the expression *) + val get_env: t -> Environment.t + + +diff --git a/apron/mlapronidl/tcons1.idl b/apron/mlapronidl/tcons1.idl +index 72cd7d4..b362a8f 100644 +--- a/apron/mlapronidl/tcons1.idl ++++ b/apron/mlapronidl/tcons1.idl +@@ -40,7 +40,7 @@ type typ = Lincons0.typ =\n\ + quote(MLI,"\n\ + (** Make a tree expression constraint. Modifying later the linear expression ({e not\n\ + advisable}) modifies correspondingly the tree expression constraint and conversely,\n\ +- except for changes of environements *)\n\ ++ except for changes of environments *)\n\ + val make: Texpr1.t -> typ -> t\n\ + \n\ + (** Copy (deep copy) *)\n\ +@@ -60,7 +60,7 @@ val set_typ: t -> typ -> unit\n\ + \n\ + ") + +-quote(MLI,"(** Change the environement of the constraint for a super-environement. Raise [Failure] if it is not the case *)") ++quote(MLI,"(** Change the environment of the constraint for a super-environment. Raise [Failure] if it is not the case *)") + struct ap_tcons1_t ap_tcons1_extend_environment(const struct ap_tcons1_t tcons, + ap_environment_ptr env) + quote(call,"\n\ +@@ -90,17 +90,17 @@ void ap_tcons1_extend_environment_with(struct ap_tcons1_t tcons, + ; + + quote(MLI,"\n\ +-(** Get the environement of the tree expression constraint *)\n\ ++(** Get the environment of the tree expression constraint *)\n\ + val get_env: t -> Environment.t\n\ + \n\ + (** Get the underlying linear expression. Modifying the linear expression ({e\n\ + not advisable}) modifies correspondingly the tree expression constraint and\n\ +- conversely, except for changes of environements *)\n\ ++ conversely, except for changes of environments *)\n\ + val get_texpr1: t -> Texpr1.t\n\ + \n\ + (** Get the underlying tree expression constraint of level 0. Modifying the constraint\n\ + of level 0 ({e not advisable}) modifies correspondingly the tree expression constraint\n\ +- and conversely, except for changes of environements*)\n\ ++ and conversely, except for changes of environments*)\n\ + val get_tcons0: t -> Tcons0.t\n\ + \n\ + ") +@@ -137,7 +137,7 @@ quote(MLMLI,"(** {2 Type array} *)") + quote(MLMLI,"(* ====================================================================== *)") + quote(MLI,"\n\ + (** Make an array of tree expression constraints with the given size and defined on the\n\ +- given environement. The elements are initialized with the constraint 0=0. *)\n\ ++ given environment. The elements are initialized with the constraint 0=0. *)\n\ + val array_make : Environment.t -> int -> earray\n\ + \n\ + (** Print an array of constraints *)\n\ +@@ -157,12 +157,12 @@ val array_get_env : earray -> Environment.t\n\ + val array_get : earray -> int -> t\n\ + \n\ + (** Set the element of the given index (without any copy). The array and the\n\ +- constraint should be defined on the same environement; otherwise a [Failure]\n\ ++ constraint should be defined on the same environment; otherwise a [Failure]\n\ + exception is raised.*)\n\ + val array_set : earray -> int -> t -> unit\n\ + ") + +-quote(MLI,"(** Change the environement of the array of constraints for a super-environement. Raise [Failure] if it is not the case*)") ++quote(MLI,"(** Change the environment of the array of constraints for a super-environment. Raise [Failure] if it is not the case*)") + struct ap_tcons1_array_t ap_tcons1_array_extend_environment(const struct ap_tcons1_array_t array, + ap_environment_ptr env) + quote(call,"\n\ +diff --git a/apron/mlapronidl/tcons1.mli b/apron/mlapronidl/tcons1.mli +index bd85bac..e1d16ca 100644 +--- a/apron/mlapronidl/tcons1.mli ++++ b/apron/mlapronidl/tcons1.mli +@@ -24,7 +24,7 @@ type typ = Lincons0.typ = + + (** Make a tree expression constraint. Modifying later the linear expression ({e not + advisable}) modifies correspondingly the tree expression constraint and conversely, +-except for changes of environements *) ++except for changes of environments *) + val make: Texpr1.t -> typ -> t + + (** Copy (deep copy) *) +@@ -43,7 +43,7 @@ val get_typ: t -> typ + val set_typ: t -> typ -> unit + + +-(** Change the environement of the constraint for a super-environement. Raise [Failure] if it is not the case *) ++(** Change the environment of the constraint for a super-environment. Raise [Failure] if it is not the case *) + external extend_environment : t -> Environment.t -> t + = "camlidl_tcons1_ap_tcons1_extend_environment" + +@@ -52,17 +52,17 @@ external extend_environment_with : t -> Environment.t -> unit + = "camlidl_tcons1_ap_tcons1_extend_environment_with" + + +-(** Get the environement of the tree expression constraint *) ++(** Get the environment of the tree expression constraint *) + val get_env: t -> Environment.t + + (** Get the underlying linear expression. Modifying the linear expression ({e + not advisable}) modifies correspondingly the tree expression constraint and +-conversely, except for changes of environements *) ++conversely, except for changes of environments *) + val get_texpr1: t -> Texpr1.t + + (** Get the underlying tree expression constraint of level 0. Modifying the constraint + of level 0 ({e not advisable}) modifies correspondingly the tree expression constraint +-and conversely, except for changes of environements*) ++and conversely, except for changes of environments*) + val get_tcons0: t -> Tcons0.t + + +@@ -71,7 +71,7 @@ val get_tcons0: t -> Tcons0.t + (* ====================================================================== *) + + (** Make an array of tree expression constraints with the given size and defined on the +-given environement. The elements are initialized with the constraint 0=0. *) ++given environment. The elements are initialized with the constraint 0=0. *) + val array_make : Environment.t -> int -> earray + + (** Print an array of constraints *) +@@ -91,11 +91,11 @@ val array_get_env : earray -> Environment.t + val array_get : earray -> int -> t + + (** Set the element of the given index (without any copy). The array and the +-constraint should be defined on the same environement; otherwise a [Failure] ++constraint should be defined on the same environment; otherwise a [Failure] + exception is raised.*) + val array_set : earray -> int -> t -> unit + +-(** Change the environement of the array of constraints for a super-environement. Raise [Failure] if it is not the case*) ++(** Change the environment of the array of constraints for a super-environment. Raise [Failure] if it is not the case*) + external array_extend_environment : earray -> Environment.t -> earray + = "camlidl_tcons1_ap_tcons1_array_extend_environment" + +diff --git a/apron/mlapronidl/texpr1.idl b/apron/mlapronidl/texpr1.idl +index f3e1bb4..1d1ae3a 100644 +--- a/apron/mlapronidl/texpr1.idl ++++ b/apron/mlapronidl/texpr1.idl +@@ -351,7 +351,7 @@ let is_scalar x = Texpr0.is_scalar x.texpr0 \n\ + ") + + quote(MLMLI,"\n(** {2 Operations} *)\n") +-quote(MLI,"(** Change the environment of the expression for a super-environement. Raise [Failure] if it is not the case *)") ++quote(MLI,"(** Change the environment of the expression for a super-environment. Raise [Failure] if it is not the case *)") + [ref]struct ap_texpr1_t* ap_texpr1_extend_environment([ref]struct ap_texpr1_t* texpr, + ap_environment_ptr env) + quote(call,"\n\ +@@ -386,7 +386,7 @@ quote(MLI,"\n\ + (** Get the underlying expression of level 0 (which is not a copy). *)\n\ + val get_texpr0: t -> Texpr0.t\n\ + \n\ +-(** Get the environement of the expression *)\n\ ++(** Get the environment of the expression *)\n\ + val get_env: t -> Environment.t\n\ + \n\ + ") +diff --git a/apron/mlapronidl/texpr1.mli b/apron/mlapronidl/texpr1.mli +index e11d510..058a793 100644 +--- a/apron/mlapronidl/texpr1.mli ++++ b/apron/mlapronidl/texpr1.mli +@@ -88,7 +88,7 @@ val is_scalar : t -> bool + + (** {2 Operations} *) + +-(** Change the environment of the expression for a super-environement. Raise [Failure] if it is not the case *) ++(** Change the environment of the expression for a super-environment. Raise [Failure] if it is not the case *) + external extend_environment : t -> Environment.t -> t + = "camlidl_texpr1_ap_texpr1_extend_environment" + +@@ -100,7 +100,7 @@ external extend_environment_with : t -> Environment.t -> unit + (** Get the underlying expression of level 0 (which is not a copy). *) + val get_texpr0: t -> Texpr0.t + +-(** Get the environement of the expression *) ++(** Get the environment of the expression *) + val get_env: t -> Environment.t + + +diff --git a/apron/octagons/tmp/abstract1.idl b/apron/octagons/tmp/abstract1.idl +index 027d1e4..3b4b666 100644 +--- a/apron/octagons/tmp/abstract1.idl ++++ b/apron/octagons/tmp/abstract1.idl +@@ -470,7 +470,7 @@ quote(MLMLI,"(* ============================================================ *)" + quote(MLMLI,"(** {3 Change and permutation of dimensions} *)\n") + quote(MLMLI,"(* ============================================================ *)") + +-quote(MLI,"(** Change the environement of the abstract values.\n\nVariables that are removed are first existentially quantified, and variables that are introduced are unconstrained. The Boolean, if true, adds a projection onto 0-plane for these ones. *)") ++quote(MLI,"(** Change the environment of the abstract values.\n\nVariables that are removed are first existentially quantified, and variables that are introduced are unconstrained. The Boolean, if true, adds a projection onto 0-plane for these ones. *)") + struct ap_abstract1_t ap_abstract1_change_environment(ap_manager_ptr man, + [ref]struct ap_abstract1_t* a, + ap_environment_ptr v1, +@@ -574,7 +574,7 @@ quote(MLI,"(** \ + It results in (n+1) unrelated variables having\n \ + same relations with other variables. The additional variables are added to the environment of \n\ + the argument for making the environment of the result, so they should\n\ +- not belong to the initial environement.\n\ ++ not belong to the initial environment.\n\ + *)") + struct ap_abstract1_t ap_abstract1_expand(ap_manager_ptr man, [ref]struct ap_abstract1_t* a, + ap_var_t v1, +diff --git a/apron/octagons/tmp/environment.idl b/apron/octagons/tmp/environment.idl +index bc2c1f4..ba94695 100644 +--- a/apron/octagons/tmp/environment.idl ++++ b/apron/octagons/tmp/environment.idl +@@ -210,7 +210,7 @@ boolean ap_environment_equal(ap_environment_ptr env1, + _res = ap_environment_is_eq(env1,env2);\n\ + "); + +-quote(MLI,"\n(** Compare two environment. [compare env1 env2] return [-2] if the environements are not compatible (a variable has different types in the 2 environements), [-1] if [env1] is a subset of env2, [0] if equality, [+1] if env1 is a superset of env2, and [+2] otherwise (the lce exists and is a strict superset of both) *)") ++quote(MLI,"\n(** Compare two environment. [compare env1 env2] return [-2] if the environments are not compatible (a variable has different types in the 2 environments), [-1] if [env1] is a subset of env2, [0] if equality, [+1] if env1 is a superset of env2, and [+2] otherwise (the lce exists and is a strict superset of both) *)") + int ap_environment_compare(ap_environment_ptr env1, + ap_environment_ptr env2); + +diff --git a/apron/octagons/tmp/generator1.idl b/apron/octagons/tmp/generator1.idl +index 9bee426..3ab4d0c 100644 +--- a/apron/octagons/tmp/generator1.idl ++++ b/apron/octagons/tmp/generator1.idl +@@ -40,7 +40,7 @@ type typ = Generator0.typ = \n\ + quote(MLI,"\n\ + (** Make a generator. Modifying later the linear expression ({e not\n\ + advisable}) modifies correspondingly the generator and conversely,\n\ +- except for changes of environements *)\n\ ++ except for changes of environments *)\n\ + val make: Linexpr1.t -> Generator0.typ -> t\n\ + \n\ + (** Copy (deep copy) *)\n\ +@@ -107,7 +107,7 @@ void ap_generator1_set_coeff([ref]struct ap_generator1_t* a, ap_var_t var, + }\n\ + }"); + +-quote(MLI,"(** Change the environement of the generator for a super-environement. Raise [Failure] if it is not the case *)") ++quote(MLI,"(** Change the environment of the generator for a super-environment. Raise [Failure] if it is not the case *)") + struct ap_generator1_t ap_generator1_extend_environment(const struct ap_generator1_t generator, + ap_environment_ptr env) + quote(call,"\n\ +@@ -184,7 +184,7 @@ quote(MLMLI,"(* ================================================================ + + quote(MLI,"\n\ + (** Make an array of generators with the given size and defined on the\n\ +- given environement. The elements are initialized with the line 0. *)\n\ ++ given environment. The elements are initialized with the line 0. *)\n\ + val array_make : Environment.t -> int -> earray\n\ + \n\ + (** Print an array of generators *)\n\ +@@ -201,12 +201,12 @@ val array_length : earray -> int\n\ + val array_get : earray -> int -> t\n\ + \n\ + (** Set the element of the given index (without any copy). The array and the\n\ +- generator should be defined on the same environement; otherwise a [Failure]\n\ ++ generator should be defined on the same environment; otherwise a [Failure]\n\ + exception is raised.*)\n\ + val array_set : earray -> int -> t -> unit\n\ + ") + +-quote(MLI,"(** Change the environement of the array of generators for a super-environement. Raise [Failure] if it is not the case*)") ++quote(MLI,"(** Change the environment of the array of generators for a super-environment. Raise [Failure] if it is not the case*)") + struct ap_generator1_array_t ap_generator1_array_extend_environment(const struct ap_generator1_array_t array, + ap_environment_ptr env) + quote(call,"\n\ +@@ -236,17 +236,17 @@ void ap_generator1_array_extend_environment_with(struct ap_generator1_array_t ar + ; + + quote(MLI,"\n\ +-(** Get the environement of the generator *)\n\ ++(** Get the environment of the generator *)\n\ + val get_env: t -> Environment.t\n\ + \n\ + (** Get the underlying linear expression. Modifying the linear expression ({e\n\ + not advisable}) modifies correspondingly the generator and\n\ +- conversely, except for changes of environements *)\n\ ++ conversely, except for changes of environments *)\n\ + val get_linexpr1: t -> Linexpr1.t\n\ + \n\ + (** Get the underlying generator of level 0. Modifying the generator\n\ + of level 0 ({e not advisable}) modifies correspondingly the generator\n\ +- and conversely, except for changes of environements*)\n\ ++ and conversely, except for changes of environments*)\n\ + val get_generator0: t -> Generator0.t\n\ + ") + +diff --git a/apron/octagons/tmp/lincons1.idl b/apron/octagons/tmp/lincons1.idl +index 877ffc4..9844aa7 100644 +--- a/apron/octagons/tmp/lincons1.idl ++++ b/apron/octagons/tmp/lincons1.idl +@@ -40,7 +40,7 @@ type typ = Lincons0.typ =\n\ + quote(MLI,"\n\ + (** Make a linear constraint. Modifying later the linear expression ({e not\n\ + advisable}) modifies correspondingly the linear constraint and conversely,\n\ +- except for changes of environements *)\n\ ++ except for changes of environments *)\n\ + val make: Linexpr1.t -> typ -> t\n\ + \n\ + (** Copy (deep copy) *)\n\ +@@ -122,7 +122,7 @@ struct ap_lincons1_t ap_lincons1_make_unsat(ap_environment_ptr env); + quote(MLI,"(** Is the constraint not satisfiable ? *)") + boolean ap_lincons1_is_unsat([ref]struct ap_lincons1_t* cons); + +-quote(MLI,"(** Change the environement of the constraint for a super-environement. Raise [Failure] if it is not the case *)") ++quote(MLI,"(** Change the environment of the constraint for a super-environment. Raise [Failure] if it is not the case *)") + struct ap_lincons1_t ap_lincons1_extend_environment(const struct ap_lincons1_t lincons, + ap_environment_ptr env) + quote(call,"\n\ +@@ -152,17 +152,17 @@ void ap_lincons1_extend_environment_with(struct ap_lincons1_t lincons, + ; + + quote(MLI,"\n\ +-(** Get the environement of the linear constraint *)\n\ ++(** Get the environment of the linear constraint *)\n\ + val get_env: t -> Environment.t\n\ + \n\ + (** Get the underlying linear expression. Modifying the linear expression ({e\n\ + not advisable}) modifies correspondingly the linear constraint and\n\ +- conversely, except for changes of environements *)\n\ ++ conversely, except for changes of environments *)\n\ + val get_linexpr1: t -> Linexpr1.t\n\ + \n\ + (** Get the underlying linear constraint of level 0. Modifying the constraint\n\ + of level 0 ({e not advisable}) modifies correspondingly the linear constraint\n\ +- and conversely, except for changes of environements*)\n\ ++ and conversely, except for changes of environments*)\n\ + val get_lincons0: t -> Lincons0.t\n\ + \n\ + ") +@@ -226,7 +226,7 @@ quote(MLMLI,"(** {2 Type array} *)") + quote(MLMLI,"(* ====================================================================== *)") + quote(MLI,"\n\ + (** Make an array of linear constraints with the given size and defined on the\n\ +- given environement. The elements are initialized with the constraint 0=0. *)\n\ ++ given environment. The elements are initialized with the constraint 0=0. *)\n\ + val array_make : Environment.t -> int -> earray\n\ + \n\ + (** Print an array of constraints *)\n\ +@@ -246,12 +246,12 @@ val array_get_env : earray -> Environment.t\n\ + val array_get : earray -> int -> t\n\ + \n\ + (** Set the element of the given index (without any copy). The array and the\n\ +- constraint should be defined on the same environement; otherwise a [Failure]\n\ ++ constraint should be defined on the same environment; otherwise a [Failure]\n\ + exception is raised.*)\n\ + val array_set : earray -> int -> t -> unit\n\ + ") + +-quote(MLI,"(** Change the environement of the array of constraints for a super-environement. Raise [Failure] if it is not the case*)") ++quote(MLI,"(** Change the environment of the array of constraints for a super-environment. Raise [Failure] if it is not the case*)") + struct ap_lincons1_array_t ap_lincons1_array_extend_environment(const struct ap_lincons1_array_t array, + ap_environment_ptr env) + quote(call,"\n\ +diff --git a/apron/octagons/tmp/linexpr1.idl b/apron/octagons/tmp/linexpr1.idl +index c388229..98434b7 100644 +--- a/apron/octagons/tmp/linexpr1.idl ++++ b/apron/octagons/tmp/linexpr1.idl +@@ -90,7 +90,7 @@ void ap_linexpr1_set_coeff([ref]struct ap_linexpr1_t* a, ap_var_t var, + }\n\ + "); + +-quote(MLI,"(** Change the environment of the expression for a super-environement. Raise [Failure] if it is not the case *)") ++quote(MLI,"(** Change the environment of the expression for a super-environment. Raise [Failure] if it is not the case *)") + struct ap_linexpr1_t ap_linexpr1_extend_environment(const struct ap_linexpr1_t linexpr, + ap_environment_ptr env) + quote(call,"\n\ +@@ -130,7 +130,7 @@ quote(MLI,"\n\ + (** Get the underlying expression of level 0 (which is not a copy). *)\n\ + val get_linexpr0: t -> Linexpr0.t\n\ + \n\ +-(** Get the environement of the expression *)\n\ ++(** Get the environment of the expression *)\n\ + val get_env: t -> Environment.t\n\ + \n\ + ") +diff --git a/apron/octagons/tmp/tcons1.idl b/apron/octagons/tmp/tcons1.idl +index 72cd7d4..b362a8f 100644 +--- a/apron/octagons/tmp/tcons1.idl ++++ b/apron/octagons/tmp/tcons1.idl +@@ -40,7 +40,7 @@ type typ = Lincons0.typ =\n\ + quote(MLI,"\n\ + (** Make a tree expression constraint. Modifying later the linear expression ({e not\n\ + advisable}) modifies correspondingly the tree expression constraint and conversely,\n\ +- except for changes of environements *)\n\ ++ except for changes of environments *)\n\ + val make: Texpr1.t -> typ -> t\n\ + \n\ + (** Copy (deep copy) *)\n\ +@@ -60,7 +60,7 @@ val set_typ: t -> typ -> unit\n\ + \n\ + ") + +-quote(MLI,"(** Change the environement of the constraint for a super-environement. Raise [Failure] if it is not the case *)") ++quote(MLI,"(** Change the environment of the constraint for a super-environment. Raise [Failure] if it is not the case *)") + struct ap_tcons1_t ap_tcons1_extend_environment(const struct ap_tcons1_t tcons, + ap_environment_ptr env) + quote(call,"\n\ +@@ -90,17 +90,17 @@ void ap_tcons1_extend_environment_with(struct ap_tcons1_t tcons, + ; + + quote(MLI,"\n\ +-(** Get the environement of the tree expression constraint *)\n\ ++(** Get the environment of the tree expression constraint *)\n\ + val get_env: t -> Environment.t\n\ + \n\ + (** Get the underlying linear expression. Modifying the linear expression ({e\n\ + not advisable}) modifies correspondingly the tree expression constraint and\n\ +- conversely, except for changes of environements *)\n\ ++ conversely, except for changes of environments *)\n\ + val get_texpr1: t -> Texpr1.t\n\ + \n\ + (** Get the underlying tree expression constraint of level 0. Modifying the constraint\n\ + of level 0 ({e not advisable}) modifies correspondingly the tree expression constraint\n\ +- and conversely, except for changes of environements*)\n\ ++ and conversely, except for changes of environments*)\n\ + val get_tcons0: t -> Tcons0.t\n\ + \n\ + ") +@@ -137,7 +137,7 @@ quote(MLMLI,"(** {2 Type array} *)") + quote(MLMLI,"(* ====================================================================== *)") + quote(MLI,"\n\ + (** Make an array of tree expression constraints with the given size and defined on the\n\ +- given environement. The elements are initialized with the constraint 0=0. *)\n\ ++ given environment. The elements are initialized with the constraint 0=0. *)\n\ + val array_make : Environment.t -> int -> earray\n\ + \n\ + (** Print an array of constraints *)\n\ +@@ -157,12 +157,12 @@ val array_get_env : earray -> Environment.t\n\ + val array_get : earray -> int -> t\n\ + \n\ + (** Set the element of the given index (without any copy). The array and the\n\ +- constraint should be defined on the same environement; otherwise a [Failure]\n\ ++ constraint should be defined on the same environment; otherwise a [Failure]\n\ + exception is raised.*)\n\ + val array_set : earray -> int -> t -> unit\n\ + ") + +-quote(MLI,"(** Change the environement of the array of constraints for a super-environement. Raise [Failure] if it is not the case*)") ++quote(MLI,"(** Change the environment of the array of constraints for a super-environment. Raise [Failure] if it is not the case*)") + struct ap_tcons1_array_t ap_tcons1_array_extend_environment(const struct ap_tcons1_array_t array, + ap_environment_ptr env) + quote(call,"\n\ +diff --git a/apron/octagons/tmp/texpr1.idl b/apron/octagons/tmp/texpr1.idl +index f3e1bb4..1d1ae3a 100644 +--- a/apron/octagons/tmp/texpr1.idl ++++ b/apron/octagons/tmp/texpr1.idl +@@ -351,7 +351,7 @@ let is_scalar x = Texpr0.is_scalar x.texpr0 \n\ + ") + + quote(MLMLI,"\n(** {2 Operations} *)\n") +-quote(MLI,"(** Change the environment of the expression for a super-environement. Raise [Failure] if it is not the case *)") ++quote(MLI,"(** Change the environment of the expression for a super-environment. Raise [Failure] if it is not the case *)") + [ref]struct ap_texpr1_t* ap_texpr1_extend_environment([ref]struct ap_texpr1_t* texpr, + ap_environment_ptr env) + quote(call,"\n\ +@@ -386,7 +386,7 @@ quote(MLI,"\n\ + (** Get the underlying expression of level 0 (which is not a copy). *)\n\ + val get_texpr0: t -> Texpr0.t\n\ + \n\ +-(** Get the environement of the expression *)\n\ ++(** Get the environment of the expression *)\n\ + val get_env: t -> Environment.t\n\ + \n\ + ") diff -Nru apron-0.9.10/debian/patches/series apron-0.9.10/debian/patches/series --- apron-0.9.10/debian/patches/series 2016-07-14 18:16:56.000000000 +0000 +++ apron-0.9.10/debian/patches/series 2016-08-03 14:45:56.000000000 +0000 @@ -7,3 +7,4 @@ 0007-Fix-rounding-mode-check-in-assert.patch 0008-Fix-build-failure-with-ppl-1.0.patch 0009-Don-t-define-strdup.patch +0010-Fix-typos.patch diff -Nru apron-0.9.10/debian/rules apron-0.9.10/debian/rules --- apron-0.9.10/debian/rules 2016-07-14 18:16:56.000000000 +0000 +++ apron-0.9.10/debian/rules 2016-08-03 14:45:56.000000000 +0000 @@ -3,6 +3,10 @@ include /usr/share/ocaml/ocamlvars.mk +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -44,6 +48,10 @@ ln -s $$i.0 debian/tmp/usr/lib/$$i; \ done +.PHONY: override_dh_install +override_dh_install: + dh_install --fail-missing -X_debug.so -Xap_ppl_test + .PHONY: override_dh_compress override_dh_compress: dh_compress -X.c -X.ml