[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090902+beryllium+dfsg-1-4-gd7d9ec3
Mehdi Dogguy
mehdi at debian.org
Sun Jan 17 19:52:10 UTC 2010
The following commit has been merged in the master branch:
commit 018e03df848a54c5c42c037608310992109e6414
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Sun Jan 17 19:59:42 2010 +0100
Fix hyphen-used-as-minus-sign
diff --git a/debian/changelog b/debian/changelog
index fcbbdac..0d926cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ frama-c (20090902+beryllium+dfsg-2) unstable; urgency=low
* Fix installability problem by installing frama-c-gui.1 only once.
* Remove empty dirs
+ * Fix hyphen-used-as-minus-sign
-- Mehdi Dogguy <mehdi at debian.org> Sun, 17 Jan 2010 19:33:00 +0100
diff --git a/debian/patches/0004-Use-GSourceView2.patch b/debian/patches/0001-Use-GSourceView2.patch
similarity index 94%
rename from debian/patches/0004-Use-GSourceView2.patch
rename to debian/patches/0001-Use-GSourceView2.patch
index bac11db..b773e9c 100644
--- a/debian/patches/0004-Use-GSourceView2.patch
+++ b/debian/patches/0001-Use-GSourceView2.patch
@@ -19,10 +19,10 @@ Subject: [PATCH] Use GSourceView2
13 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/Makefile b/Makefile
-index 3a70533..fab3a2c 100644
+index 1a923ec..5c88587 100644
--- a/Makefile
+++ b/Makefile
-@@ -1117,8 +1117,8 @@ ifeq ($(HAS_GTKSOURCEVIEW),yes)
+@@ -1150,8 +1150,8 @@ ifeq ($(HAS_GTKSOURCEVIEW),yes)
ifeq ($(HAS_LEGACY_GTKSOURCEVIEW),yes)
GUI_INCLUDES += -I +lablgtksourceview
endif
@@ -34,10 +34,10 @@ index 3a70533..fab3a2c 100644
src/gui/filetree.ml: Makefile
diff --git a/configure b/configure
-index 0b6659a..963b705 100755
+index 0d331c6..95499c7 100755
--- a/configure
+++ b/configure
-@@ -8005,17 +8005,17 @@ $as_echo "$as_me: error: $p requested but $OCAMLLIB/lablgtk2/lablgtk.$LIB_SUFFIX
+@@ -7841,17 +7841,17 @@ $as_echo "$as_me: error: $p requested but $OCAMLLIB/lablgtk2/lablgtk.$LIB_SUFFIX
if test -n "$REQUIRE_GTKSOURCEVIEW" -o -n "$USE_GTKSOURCEVIEW" -o "no" == "yes"; then
HAS_GTKSOURCEVIEW=no
if test "$HAS_GTKSOURCEVIEW" != "yes"; then
@@ -61,7 +61,7 @@ index 0b6659a..963b705 100755
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
-@@ -8070,20 +8070,20 @@ fi
+@@ -7906,20 +7906,20 @@ fi
fi
if test "$HAS_GTKSOURCEVIEW" == "no"; then
@@ -87,7 +87,7 @@ index 0b6659a..963b705 100755
done
fi
if test "$USE_GTKSOURCEVIEW" != ""; then
-@@ -8093,7 +8093,7 @@ $as_echo "$as_me: error: $p requested but $OCAMLLIB/lablgtk2/lablgtksourceview.$
+@@ -7929,7 +7929,7 @@ $as_echo "$as_me: error: $p requested but $OCAMLLIB/lablgtk2/lablgtksourceview.$
ep=ENABLE_`upper "$p"`
eval eep="\$$ep"
if test "`echo $eep | sed -e 's/ .*//' `" != "no"; then
@@ -97,7 +97,7 @@ index 0b6659a..963b705 100755
done
fi
diff --git a/src/gui/design.ml b/src/gui/design.ml
-index d50a076..db1dc1d 100644
+index 37e549f..6d0bed7 100644
--- a/src/gui/design.ml
+++ b/src/gui/design.ml
@@ -49,7 +49,7 @@ let all_files () =
@@ -127,7 +127,7 @@ index d50a076..db1dc1d 100644
-> unit
method register_panel :
-@@ -629,7 +629,7 @@ let (selector: (GMenu.menu GMenu.factory ->
+@@ -663,7 +663,7 @@ let (selector: (GMenu.menu GMenu.factory ->
class type reactive_buffer = object
inherit error_manager
@@ -137,7 +137,7 @@ index d50a076..db1dc1d 100644
method rehighlight : unit
end
diff --git a/src/gui/design.mli b/src/gui/design.mli
-index 7f88d66..d813ed6 100644
+index 5f69f6f..8aad37e 100644
--- a/src/gui/design.mli
+++ b/src/gui/design.mli
@@ -32,7 +32,7 @@ open Cil_types
@@ -192,10 +192,10 @@ index c6aba7c..10a47b7 100644
val expand_to_path : GTree.view -> Gtk.tree_path -> unit
diff --git a/src/gui/pretty_source.mli b/src/gui/pretty_source.mli
-index e13c91b..935192a 100644
+index 69b12f7..8fc7317 100644
--- a/src/gui/pretty_source.mli
+++ b/src/gui/pretty_source.mli
-@@ -47,7 +47,7 @@ end
+@@ -49,7 +49,7 @@ end
val display_source :
global list ->
@@ -264,10 +264,10 @@ index c2da4f1..3a8b508 100644
val enable_popup : t -> bool -> unit
diff --git a/src/gui/source_viewer.ml b/src/gui/source_viewer.ml
-index 7857435..46cd9fe 100644
+index 6e11b91..7ff7f1f 100644
--- a/src/gui/source_viewer.ml
+++ b/src/gui/source_viewer.ml
-@@ -24,16 +24,16 @@
+@@ -22,16 +22,16 @@
(* Build a read only text view for C source code. *)
@@ -289,7 +289,7 @@ index 7857435..46cd9fe 100644
let make ~packing =
(* let d = GWindow.font_selection_dialog ~title:"tutu" ~show:true () in
-@@ -42,9 +42,9 @@ let make ~packing =
+@@ -40,9 +40,9 @@ let make ~packing =
Utf8_logic.forall Utf8_logic.exists Utf8_logic.eq Utf8_logic.neq) ;
*)
let original_source_window =
@@ -301,7 +301,7 @@ index 7857435..46cd9fe 100644
~editable:false
~packing
()
-@@ -67,7 +67,7 @@ let make ~packing =
+@@ -65,7 +65,7 @@ let make ~packing =
let buffer () =
@@ -326,10 +326,10 @@ index ecde1f7..92641cc 100644
diff --git a/src/scope/dpds_gui.ml b/src/scope/dpds_gui.ml
-index a783258..5aeb130 100644
+index 2586f94..bff9206 100644
--- a/src/scope/dpds_gui.ml
+++ b/src/scope/dpds_gui.ml
-@@ -387,7 +387,7 @@ let callbacks ?(defs=false) ?(zones=false) ?(scope=false) ?(pscope=false)
+@@ -390,7 +390,7 @@ let callbacks ?(defs=false) ?(zones=false) ?(scope=false) ?(pscope=false)
end
in main_ui#rehighlight ()
@@ -339,7 +339,7 @@ index a783258..5aeb130 100644
let _kf, start_s, _txt = DpdsState.get () in
let put_tag tag = match tag with ("",[]) -> ()
diff --git a/src/slicing/register_gui.ml b/src/slicing/register_gui.ml
-index dfe30ec..864c96c 100644
+index 6ee9e1a..273ac3b 100644
--- a/src/slicing/register_gui.ml
+++ b/src/slicing/register_gui.ml
@@ -345,7 +345,7 @@ let slicing_selector (popup_factory:GMenu.menu GMenu.factory)
@@ -352,10 +352,10 @@ index dfe30ec..864c96c 100644
(* Definition for highlight 'Slicing' *)
let highlight project =
diff --git a/src/value/register_gui.ml b/src/value/register_gui.ml
-index 6c6cbe4..d7e601b 100644
+index 2b8b2d8..8ce638b 100644
--- a/src/value/register_gui.ml
+++ b/src/value/register_gui.ml
-@@ -302,7 +302,7 @@ let main (main_ui:Design.main_window_extension_points) =
+@@ -303,7 +303,7 @@ let main (main_ui:Design.main_window_extension_points) =
in
main_ui#register_source_selector value_selector;
diff --git a/debian/patches/0002-Fix-hyphen-used-as-minus-sign.patch b/debian/patches/0002-Fix-hyphen-used-as-minus-sign.patch
new file mode 100644
index 0000000..1665f11
--- /dev/null
+++ b/debian/patches/0002-Fix-hyphen-used-as-minus-sign.patch
@@ -0,0 +1,40 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 17 Jan 2010 19:59:01 +0100
+Subject: [PATCH] Fix hyphen-used-as-minus-sign
+
+---
+ man/frama-c.1 | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/man/frama-c.1 b/man/frama-c.1
+index b865a62..d9a4222 100644
+--- a/man/frama-c.1
++++ b/man/frama-c.1
+@@ -90,7 +90,7 @@ framework. This framework can be extended by additional plugins placed in the
+ .B $FRAMAC_PLUGIN
+ directory. The command
+ .IP
+-frama-c -help
++frama\-c \-help
+ .PP
+ will provide the full list of the plugins that are currently installed.
+ .P
+@@ -168,7 +168,7 @@ as the command to pre-process C files. Defaults to the
+ .B CPP
+ environment variable or to
+ .IP
+-gcc -C -E -I.
++gcc \-C \-E \-I.
+ .IP
+ if it is not set. In order to preserve ACSL annotations, the preprocessor must
+ keep comments (the
+@@ -326,7 +326,7 @@ outputs the directory where Frama-C stores its data (can be overidden by the
+ variable)
+ .TP
+ .B -print-plugin-path
+-outputs the directory where Frama-C searchs its plugins (can be overidden by the
++outputs the directory where Frama-C searches its plugins (can be overidden by the
+ .B FRAMAC_PLUGIN
+ variable and the
+ .B -add-path
+--
diff --git a/debian/patches/series b/debian/patches/series
index 06192d3..1ffb0c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-0004-Use-GSourceView2.patch
+0001-Use-GSourceView2.patch
+0002-Fix-hyphen-used-as-minus-sign.patch
--
frama-c packaging
More information about the Pkg-ocaml-maint-commits
mailing list