[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090902+beryllium+dfsg-6-16-gdbbc991
Mehdi Dogguy
mehdi at debian.org
Tue Apr 27 14:42:18 UTC 2010
The following commit has been merged in the master branch:
commit eb6fe005bf89f4c57d49c62637f7045e05c6c93e
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Sun Apr 25 16:11:12 2010 +0200
Add some patches
diff --git a/debian/changelog b/debian/changelog
index 987b434..8418781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,23 @@
frama-c (20100401+boron+dfsg-1) UNRELEASED; urgency=low
* UNRELEASED
- * New upstream release: Remove some patches integrated by upstream:
- - 0001-Use-GSourceView2.patch
- - 0003-Do-not-install-native-Kernel-modules-on-bytecode-arc.patch
- - 0004-temp_file-changed-in-OCaml-3.11.2.patch
+ * New upstream release:
+ - Remove some patches integrated by upstream:
+ + 0001-Use-GSourceView2.patch
+ + 0003-Do-not-install-native-Kernel-modules-on-bytecode-arc.patch
+ + 0004-temp_file-changed-in-OCaml-3.11.2.patch
+ - Add some patches:
+ + 0002-.make-ocamlgraph-no-op-for-non-local-ocamlgraph
+ + 0003-Fix-build-on-bytecode-only-architectures.patch
+ + 0004-Fix-some-typos.patch
+ + 0005-Don-t-modify-system-files.patch
+ + 0006-Fix-build-on-bytecode-only-architectures.patch
+ - Update:
+ + 0001-Fix-hyphen-used-as-minus-sign-and-a-typo.patch
* Set Priority to optional
* Set filter-pristine-tar in debian/gbp.conf
- -- Mehdi Dogguy <mehdi at debian.org> Sun, 25 Apr 2010 15:36:48 +0200
+ -- Mehdi Dogguy <mehdi at debian.org> Sun, 25 Apr 2010 16:10:03 +0200
frama-c (20090902+beryllium+dfsg-5) unstable; urgency=low
diff --git a/debian/patches/0002-.make-ocamlgraph-no-op-for-non-local-ocamlgraph.patch b/debian/patches/0002-.make-ocamlgraph-no-op-for-non-local-ocamlgraph.patch
new file mode 100644
index 0000000..2759dce
--- /dev/null
+++ b/debian/patches/0002-.make-ocamlgraph-no-op-for-non-local-ocamlgraph.patch
@@ -0,0 +1,29 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 25 Apr 2010 16:09:46 +0200
+Subject: [PATCH] .make-ocamlgraph no-op for non-local ocamlgraph
+
+---
+ Makefile | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6f21662..4c9e01a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -381,6 +381,7 @@ endif # testing ocamlgraph is local
+ # change '.make-ocamlgraph-stamp' before 'cvs commit'
+ .make-ocamlgraph: .make-ocamlgraph-stamp
+ touch $@
++ifneq ("$(OCAMLGRAPH_LOCAL)","")
+ # Inline the rules of "untar-ocamlgraph" here
+ # because calling a recursive make does not work
+ $(PRINT_UNTAR) ocamlgraph
+@@ -388,6 +389,7 @@ endif # testing ocamlgraph is local
+ $(TAR) xzf ocamlgraph.tar.gz
+ cd $(OCAMLGRAPH_LOCAL) && ./configure
+ $(MAKE) clean
++endif
+
+ include .make-ocamlgraph
+ DISTRIB_FILES += .make-ocamlgraph
+--
diff --git a/debian/patches/0003-Fix-build-on-bytecode-only-architectures.patch b/debian/patches/0003-Fix-build-on-bytecode-only-architectures.patch
new file mode 100644
index 0000000..12f7ebe
--- /dev/null
+++ b/debian/patches/0003-Fix-build-on-bytecode-only-architectures.patch
@@ -0,0 +1,60 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Tue, 27 Apr 2010 11:29:19 +0200
+Subject: [PATCH] Fix build on bytecode-only architectures
+
+---
+ Makefile | 19 ++++++++++++-------
+ 1 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4c9e01a..8e6a14c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1232,7 +1232,7 @@ lablgtk.cmxa:
+
+ include share/Makefile.plugin
+
+-gui: lib/plugins/Gui.cmo
++gui:: lib/plugins/Gui.cmo
+
+ else
+
+@@ -1249,6 +1249,7 @@ SINGLE_GUI_CMO:= gui_parameters \
+ property_navigator
+ SINGLE_GUI_CMO:= $(patsubst %, src/gui/%.cmo, $(SINGLE_GUI_CMO))
+
++SINGLE_GUI_O = $(SINGLE_GUI_CMO:.cmo=.o)
+ SINGLE_GUI_CMI = $(SINGLE_GUI_CMO:.cmo=.cmi)
+ SINGLE_GUI_CMX = $(SINGLE_GUI_CMO:.cmo=.cmx)
+
+@@ -1271,8 +1272,10 @@ $(PLUGIN_DEP_GUI_CMX_LIST) $(PLUGIN_DYN_DEP_GUI_CMX_LIST): OFLAGS+= $(GUI_INCLUD
+
+ .PHONY:gui
+
+-gui:: bin/viewer.byte$(EXE) bin/viewer.opt$(EXE) \
+- share/Makefile.dynamic_config share/Makefile.kernel
++ifeq ($(OCAMLBEST),opt)
++gui:: bin/viewer.opt$(EXE)
++endif
++gui:: bin/viewer.byte$(EXE) share/Makefile.dynamic_config share/Makefile.kernel
+ $(MAKE) install-gui FRAMAC_LIBDIR=lib/fc
+
+ ALL_GUI_CMO= $(ALL_CMO) $(GRAPH_GUICMO) $(GUICMO)
+@@ -1635,10 +1638,12 @@ install-kernel-opt:
+ install-gui:
+ $(PRINT_CP) gui API
+ $(MKDIR) $(FRAMAC_LIBDIR)
+- if [ "$(ENABLE_GUI)" != "no" ]; then \
+- $(CP) $(SINGLE_GUI_CMI) $(SINGLE_GUI_CMO) $(SINGLE_GUI_CMX) \
+- $(FRAMAC_LIBDIR); \
+- fi
++ifneq ($(ENABLE_GUI),no)
++ $(CP) $(SINGLE_GUI_CMI) $(SINGLE_GUI_CMO) $(FRAMAC_LIBDIR)
++ifeq ($(OCAMLBEST),opt)
++ $(CP) $(SINGLE_GUI_CMX) $(SINGLE_GUI_O) $(FRAMAC_LIBDIR)
++endif
++endif
+
+ .PHONY: install
+ install::
+--
diff --git a/debian/patches/0004-Fix-some-typos.patch b/debian/patches/0004-Fix-some-typos.patch
new file mode 100644
index 0000000..bf6fbff
--- /dev/null
+++ b/debian/patches/0004-Fix-some-typos.patch
@@ -0,0 +1,342 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Tue, 27 Apr 2010 11:44:45 +0200
+Subject: [PATCH] Fix some typos
+
+---
+ cil/src/frontc/cabs2cil.ml | 4 ++--
+ cil/src/logic/logic_preprocess.ml | 2 +-
+ cil/src/logic/logic_preprocess.mll | 2 +-
+ cil/src/logic/logic_typing.ml | 2 +-
+ man/frama-c.1 | 2 +-
+ ptests/ptests.ml | 2 +-
+ src/ai/base.ml | 2 +-
+ src/ai/base.mli | 2 +-
+ src/aorai/abstract_ai.ml | 2 +-
+ src/aorai/bycase_ai.ml | 2 +-
+ src/kernel/journal.ml | 2 +-
+ src/kernel/special_hooks.ml | 2 +-
+ src/lib/qstack.mli | 2 +-
+ src/memory_state/locations.mli | 4 ++--
+ src/project/kind.ml | 4 ++--
+ src/project/kind.mli | 4 ++--
+ src/scope/dpds_gui.ml | 2 +-
+ src/slicing/fct_slice.ml | 6 +++---
+ src/slicing/register.ml | 2 +-
+ src/slicing/slicingProject.ml | 2 +-
+ 20 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/cil/src/frontc/cabs2cil.ml b/cil/src/frontc/cabs2cil.ml
+index 1f83e58..c6c8828 100644
+--- a/cil/src/frontc/cabs2cil.ml
++++ b/cil/src/frontc/cabs2cil.ml
+@@ -1035,7 +1035,7 @@ module BlockChunk =
+
+ let unspecified_chunk c = (* c *)
+ (* to restore previous behavior (where unspecified evaluation order
+- was not explicitely marked), comment out the line below and make
++ was not explicitly marked), comment out the line below and make
+ unspecified_chunk the identity function.
+ *)
+ { c with unspecified_order = true }
+@@ -3777,7 +3777,7 @@ and getIntConstExp ghost (aexp) : exp =
+ * sizeof/alignof since (for CCured) we can't const-eval those,
+ * and it's not clear whether they can be bitfield width specifiers
+ * anyway (since that's where this function is used)
+- * -- VP 2006-12-20: C99 explicitely says so (par. 6.6.6)
++ * -- VP 2006-12-20: C99 explicitly says so (par. 6.6.6)
+ *)
+ and isIntegerConstant ghost (aexp) : int option =
+ match doExp (ghost_local_env ghost) true aexp (AExp None) with
+diff --git a/cil/src/logic/logic_preprocess.ml b/cil/src/logic/logic_preprocess.ml
+index 1698bcb..760b2cd 100644
+--- a/cil/src/logic/logic_preprocess.ml
++++ b/cil/src/logic/logic_preprocess.ml
+@@ -27,7 +27,7 @@
+ let debug = Cilmsg.debug_atleast 3 in
+ let (ppname, ppfile) = Filename.open_temp_file "ppannot" ".c" in
+ Buffer.output_buffer ppfile macros;
+- (* NB: the three extra spaces replace the begining of the annotation
++ (* NB: the three extra spaces replace the beginning of the annotation
+ in order to keep the columns count accurate (at least until there's
+ a macro expansion).
+ *)
+diff --git a/cil/src/logic/logic_preprocess.mll b/cil/src/logic/logic_preprocess.mll
+index ce51e09..7900bb8 100644
+--- a/cil/src/logic/logic_preprocess.mll
++++ b/cil/src/logic/logic_preprocess.mll
+@@ -51,7 +51,7 @@
+ let debug = Cilmsg.debug_atleast 3 in
+ let (ppname, ppfile) = Filename.open_temp_file "ppannot" ".c" in
+ Buffer.output_buffer ppfile macros;
+- (* NB: the three extra spaces replace the begining of the annotation
++ (* NB: the three extra spaces replace the beginning of the annotation
+ in order to keep the columns count accurate (at least until there's
+ a macro expansion).
+ *)
+diff --git a/cil/src/logic/logic_typing.ml b/cil/src/logic/logic_typing.ml
+index 95b0635..fe96f31 100644
+--- a/cil/src/logic/logic_typing.ml
++++ b/cil/src/logic/logic_typing.ml
+@@ -1228,7 +1228,7 @@ struct
+ | [_] -> check_current_label loc env;
+ | _ -> error loc
+ "logic function or predicate %a has multiple labels. \
+- They must be instantiated explicitely." Cil.d_logic_var info.l_var_info
++ They must be instantiated explicitly." Cil.d_logic_var info.l_var_info
+
+ let rec term env t =
+ match t.lexpr_node with
+diff --git a/man/frama-c.1 b/man/frama-c.1
+index fb9fa88..f77e8fa 100644
+--- a/man/frama-c.1
++++ b/man/frama-c.1
+@@ -113,7 +113,7 @@ Sets verbosity and debugging level to 0.
+ considers that all numerical addresses in the range
+ .I min-max
+ are valid. Bounds are parsed as ocaml integer constants. By default,
+-all numerical adresses are considered invalid.
++all numerical addresses are considered invalid.
+ .TP
+ .BI \-add\-path\ p1[,p2[...,pn]]
+ adds directories
+diff --git a/ptests/ptests.ml b/ptests/ptests.ml
+index e4b3570..ea536b6 100644
+--- a/ptests/ptests.ml
++++ b/ptests/ptests.ml
+@@ -261,7 +261,7 @@ type config =
+ (** troplevel full path and options to launch the toplevel on *)
+ dc_dont_run : bool;
+ dc_is_explicit_test: bool
+- (** set to true for single test files that are explicitely
++ (** set to true for single test files that are explicitly
+ mentioned on the command line. Overrides dc_dont_run. *)
+ }
+
+diff --git a/src/ai/base.ml b/src/ai/base.ml
+index d156faf..3ec72b5 100644
+--- a/src/ai/base.ml
++++ b/src/ai/base.ml
+@@ -44,7 +44,7 @@ type t =
+ | Var of varinfo*validity
+ | Initialized_Var of varinfo*validity
+ (** base that is implicitely initialized. *)
+- | Null (** base for adresses like [(int* )0x123] *)
++ | Null (** base for addresses like [(int* )0x123] *)
+ | String of int*string (** String constants *)
+ | Cell_class of cell_class_attributes (** a class of memory cells *)
+
+diff --git a/src/ai/base.mli b/src/ai/base.mli
+index 6182756..dcff08c 100644
+--- a/src/ai/base.mli
++++ b/src/ai/base.mli
+@@ -32,7 +32,7 @@ type t = private
+ | Var of Cil_types.varinfo*validity (** Base for uninitialized variables *)
+ | Initialized_Var of Cil_types.varinfo*validity
+ (** Base for variables initialized to zero . *)
+- | Null (** Base for adresses like [(int* )0x123] *)
++ | Null (** Base for addresses like [(int* )0x123] *)
+ | String of int*string (** String constants *)
+ | Cell_class of cell_class_attributes (** A class of memory cells *)
+
+diff --git a/src/aorai/abstract_ai.ml b/src/aorai/abstract_ai.ml
+index 4215c9c..8116d11 100644
+--- a/src/aorai/abstract_ai.ml
++++ b/src/aorai/abstract_ai.ml
+@@ -800,7 +800,7 @@ class visit_propagating_pre_post_constraints (auto:Promelaast.buchautomata) =
+
+
+ in
+- (* This computation is done from end to begining *)
++ (* This computation is done from end to beginning *)
+ prop (List.rev stmt_l) (post_st,post_tr)
+ in
+
+diff --git a/src/aorai/bycase_ai.ml b/src/aorai/bycase_ai.ml
+index 0b75a1d..faa62bb 100644
+--- a/src/aorai/bycase_ai.ml
++++ b/src/aorai/bycase_ai.ml
+@@ -816,7 +816,7 @@ class visit_propagating_pre_post_constraints_bycase (auto:Promelaast.buchautomat
+
+
+ in
+- (* This computation is done from end to begining *)
++ (* This computation is done from end to beginning *)
+ prop (List.rev stmt_l) (post_st,post_tr)
+
+ in
+diff --git a/src/kernel/journal.ml b/src/kernel/journal.ml
+index f69b752..35e9812 100644
+--- a/src/kernel/journal.ml
++++ b/src/kernel/journal.ml
+@@ -191,7 +191,7 @@ let write () =
+ let () =
+ (* write the journal iff it is enable and
+ - either an error occurs;
+- - or the user explicitely wanted it. *)
++ - or the user explicitly wanted it. *)
+ if Cmdline.journal_enable then begin
+ Cmdline.at_error_exit write;
+ if Cmdline.journal_isset then Cmdline.at_normal_exit write
+diff --git a/src/kernel/special_hooks.ml b/src/kernel/special_hooks.ml
+index 181276d..c7545c3 100644
+--- a/src/kernel/special_hooks.ml
++++ b/src/kernel/special_hooks.ml
+@@ -26,7 +26,7 @@ let version () =
+ Compilation date: %s
+ Share path: %s (may be overridden with FRAMAC_SHARE variable)
+ Library path: %s (may be overridden with FRAMAC_LIB variable)
+-Plug-in paths: %t(may be overriden with FRAMAC_PLUGIN variable)@."
++Plug-in paths: %t(may be overridden with FRAMAC_PLUGIN variable)@."
+ Config.version Config.date Config.datadir Config.libdir
+ (fun fmt -> List.iter (fun s -> Format.fprintf fmt "%s " s)
+ (Dynamic.default_path ()));
+diff --git a/src/lib/qstack.mli b/src/lib/qstack.mli
+index ec58d76..658ac30 100644
+--- a/src/lib/qstack.mli
++++ b/src/lib/qstack.mli
+@@ -49,7 +49,7 @@ module Make(D: DATA) : sig
+ (** Remove all the elements of a stack. *)
+
+ val add: D.t -> t -> unit
+- (** Add at the begining of the stack. Complexity: O(1). *)
++ (** Add at the beginning of the stack. Complexity: O(1). *)
+
+ val add_at_end: D.t -> t -> unit
+ (** Add at the end of the stack. Complexity: O(1). *)
+diff --git a/src/memory_state/locations.mli b/src/memory_state/locations.mli
+index 456c30f..2e2931a 100644
+--- a/src/memory_state/locations.mli
++++ b/src/memory_state/locations.mli
+@@ -116,7 +116,7 @@ module Location_Bytes : sig
+ joiner:('a -> 'a -> 'a) -> empty:'a -> t -> 'a
+
+ val contains_addresses_of_locals : (M.key -> bool) -> t -> bool
+- (** [contains_adresses_of_locals is_local loc] returns [true]
++ (** [contains_addresses_of_locals is_local loc] returns [true]
+ if [loc] contains the adress of a variable for which
+ [is_local] returns [true]
+ *)
+@@ -128,7 +128,7 @@ module Location_Bytes : sig
+ *)
+
+ val contains_addresses_of_any_locals : t -> bool
+- (** [contains_adresses_of_any_locals loc] returns [true] iff [loc] contains
++ (** [contains_addresses_of_any_locals loc] returns [true] iff [loc] contains
+ the adress of a local variable or of a formal variable. *)
+
+ end
+diff --git a/src/project/kind.ml b/src/project/kind.ml
+index 647f0a9..aa49a25 100644
+--- a/src/project/kind.ml
++++ b/src/project/kind.ml
+@@ -366,7 +366,7 @@ dependencies:@\n%s@\n%s at ."
+ Mark.set v 2;
+ acc
+ | _, _, Some Only_Select_Dependencies, _ ->
+- (* Do explicitely not select the dependencies *)
++ (* Do explicitly not select the dependencies *)
+ Mark.set v 2;
+ f v acc
+ | true, Some _, _, _ ->
+@@ -380,7 +380,7 @@ dependencies:@\n%s@\n%s at ."
+ Mark.set v 1;
+ f v acc
+ | false, Some Only_Select_Dependencies, None, _ ->
+- (* Do explicitely select the dependencies *)
++ (* Do explicitly select the dependencies *)
+ Mark.set v 1;
+ acc
+ in
+diff --git a/src/project/kind.mli b/src/project/kind.mli
+index 979e633..b3f2394 100644
+--- a/src/project/kind.mli
++++ b/src/project/kind.mli
+@@ -138,7 +138,7 @@ sig
+ Selection.t -> Selection.t -> (t -> 'a -> 'a) -> 'a -> 'a
+ (** [apply_in_order only except f x] folds [f] for of each kind of type [t]
+ (or for each kind specified by [only] and [except] if one of them is
+- non-empty), begining to [acc] and following a topological order of
++ non-empty), beginning to [acc] and following a topological order of
+ kinds dependencies. *)
+
+ val iter_in_order:
+@@ -158,7 +158,7 @@ sig
+ Selection.t -> Selection.t -> (T.t -> 'a -> 'a) -> 'a -> 'a
+ (** [fold_in_order only except f acc] folds [f v x] for each kind value [v]
+ of type [T.t] (or for each kind specified by [only] and
+- [except] if one of them is non-empty), begining to [acc] and following
++ [except] if one of them is non-empty), beginning to [acc] and following
+ the same order as apply_in_order. *)
+
+ val number_of_applicants: Selection.t -> Selection.t -> int option
+diff --git a/src/scope/dpds_gui.ml b/src/scope/dpds_gui.ml
+index 4984597..d8b1e3f 100644
+--- a/src/scope/dpds_gui.ml
++++ b/src/scope/dpds_gui.ml
+@@ -236,7 +236,7 @@ module ShowDef : (DpdCmdSig with type t_in = lval) = struct
+ ^"highlight the statements that define the value of D at L,\n\t"
+ ^"and print a message if a part of D might be undefined.\n\t"
+ ^"Notice that 'undefined' only means here "
+- ^"not defined on some path from the begining of the function.")
++ ^"not defined on some path from the beginning of the function.")
+
+
+ let get_info _kf_stmt_opt =
+diff --git a/src/slicing/fct_slice.ml b/src/slicing/fct_slice.ml
+index 9bf763c..ec4fd2f 100644
+--- a/src/slicing/fct_slice.ml
++++ b/src/slicing/fct_slice.ml
+@@ -418,7 +418,7 @@ end = struct
+ (** compute the marks to propagate in [pdg_caller] when the called function
+ * have the [to_prop] marks.
+ * @param fi_to_call is used to compute [more_inputs] only :
+- * a persistant input mark is not considered as a new input.
++ * a persistent input mark is not considered as a new input.
+ * *)
+ let marks_for_caller_inputs pdg_caller old_marks call to_prop fi_to_call =
+ assert (not (PdgTypes.Pdg.is_top pdg_caller));
+@@ -736,7 +736,7 @@ let examine_calls ff new_marks_in_call_outputs =
+ in FctMarks.fold_calls process_this_call ff []
+
+ (** build a new empty slice in the given [fct_info].
+-* If the function has some persistant selection, let's copy it in the new slice.
++* If the function has some persistent selection, let's copy it in the new slice.
+ * Notice that there can be at most one slice for the application entry point
+ * (main), but we allow to have several slice for a library entry point.
+ * @param build_actions (bool) is useful if the function has some persistent
+@@ -885,7 +885,7 @@ let prop_persistant_marks proj fi to_prop actions =
+ * and [propagate=true], also generates the actions to make every calls to this
+ * function visible. *)
+ let add_marks_to_fi proj fi nodes_marks propagate actions =
+- SlicingParameters.debug ~level:2 "[Fct_Slice.add_marks_to_fi] (persistant)";
++ SlicingParameters.debug ~level:2 "[Fct_Slice.add_marks_to_fi] (persistent)";
+ let marks, are_new_marks =
+ match FctMarks.fi_marks fi with
+ | Some m -> m, false
+diff --git a/src/slicing/register.ml b/src/slicing/register.ml
+index 3a6913f..bbe177a 100644
+--- a/src/slicing/register.ml
++++ b/src/slicing/register.ml
+@@ -378,7 +378,7 @@ let add_ff_selection proj ff db_select =
+ let _, select = check_ff_db_select ff db_select in
+ SlicingProject.add_fct_ff_filter proj ff select
+
+-(** add a persistant selection to the function.
++(** add a persistent selection to the function.
+ * This might change its slicing level in order to call slices later on. *)
+ let add_fi_selection proj db_select =
+ SlicingParameters.debug ~level:1 "[Register.add_fi_selection] %a"
+diff --git a/src/slicing/slicingProject.ml b/src/slicing/slicingProject.ml
+index 9cf2858..4b9bba6 100644
+--- a/src/slicing/slicingProject.ml
++++ b/src/slicing/slicingProject.ml
+@@ -53,7 +53,7 @@ let get_name proj = proj.T.name
+ let add_proj_actions proj actions = proj.T.actions <- actions @ proj.T.actions
+
+ (** Add a new slice for the function. It can be the case that it create actions
+-* if the function has some persistant selection, that make function calls to
++* if the function has some persistent selection, that make function calls to
+ * choose.
+ * @raise SlicingTypes.NoPdg when the function has no PDG.
+ * *)
+--
diff --git a/debian/patches/0005-Don-t-modify-system-files.patch b/debian/patches/0005-Don-t-modify-system-files.patch
new file mode 100644
index 0000000..5936180
--- /dev/null
+++ b/debian/patches/0005-Don-t-modify-system-files.patch
@@ -0,0 +1,26 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Tue, 27 Apr 2010 13:10:54 +0200
+Subject: [PATCH] Don't modify system files
+
+---
+ share/Makefile.dynamic | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/share/Makefile.dynamic b/share/Makefile.dynamic
+index e35b0b7..dbe5098 100644
+--- a/share/Makefile.dynamic
++++ b/share/Makefile.dynamic
+@@ -191,9 +191,9 @@ install::
+ $(CP) frama-c-$(PLUGIN_NAME).$(OCAMLBEST)$(EXE) \
+ $(BINDIR)/frama-c-$(PLUGIN_NAME)$(EXE); \
+ fi
+- $(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
+- echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
+- >> $(FRAMAC_SHARE)/known_plugins.ac
++# $(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
++# echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
++# >> $(FRAMAC_SHARE)/known_plugins.ac
+ ifeq ($(HAS_GUI),yes)
+ $(PRINT_CP) $(PLUGIN_INSTALL_DIR)/gui
+ $(CP) $(TARGETS_GUI) $(PLUGIN_INSTALL_DIR)/gui
+--
diff --git a/debian/patches/series b/debian/patches/series
index 7d4ccbe..be7dfc7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,5 @@
0001-Fix-hyphen-used-as-minus-sign-and-a-typo.patch
+0002-.make-ocamlgraph-no-op-for-non-local-ocamlgraph.patch
+0003-Fix-build-on-bytecode-only-architectures.patch
+0004-Fix-some-typos.patch
+0005-Don-t-modify-system-files.patch
--
frama-c packaging
More information about the Pkg-ocaml-maint-commits
mailing list