[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, patched, updated. debian/0.1.9.deb-1-25-gdef76de
Eugeniy Meshcheryakov
eugen at debian.org
Mon Sep 7 23:53:19 UTC 2009
The following commit has been merged in the patched branch:
commit def76dea9c4abb3c0754e7ecc49741d9a226328d
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Tue Sep 8 01:48:05 2009 +0200
patchs for version 0.1.10.deb-1
diff --git a/debian/patches/debian/documentation-paths.diff b/debian/patches/debian/documentation-paths.diff
index 3958c97..a2f3926 100644
--- a/debian/patches/debian/documentation-paths.diff
+++ b/debian/patches/debian/documentation-paths.diff
@@ -59,4 +59,4 @@ index 87e0ec8..2448f7c 100644
.SH REFERENCES
Y. Padioleau, J.L. Lawall, R.R Hansen, G. Muller
--
-tg: (8e6fb7c..) debian/documentation-paths (depends on: master)
+tg: (db116ff..) debian/documentation-paths (depends on: master)
diff --git a/debian/patches/fixes/documentation-build.diff b/debian/patches/fixes/documentation-build.diff
index f8cf92b..0323961 100644
--- a/debian/patches/fixes/documentation-build.diff
+++ b/debian/patches/fixes/documentation-build.diff
@@ -30,4 +30,4 @@ index 91d8e35..89eea99 100644
--
-tg: (3dd4272..) fixes/documentation-build (depends on: upstream)
+tg: (9b26161..) fixes/documentation-build (depends on: upstream)
diff --git a/debian/patches/fixes/system-menhir.diff b/debian/patches/fixes/system-menhir.diff
index 99e91dc..ed0741b 100644
--- a/debian/patches/fixes/system-menhir.diff
+++ b/debian/patches/fixes/system-menhir.diff
@@ -11,7 +11,7 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index 892ba07..bff7065 100644
+index e76f965..b2c2623 100644
--- a/Makefile
+++ b/Makefile
@@ -59,10 +59,10 @@ LIBS=commons/commons.cma \
@@ -43,4 +43,4 @@ index 9522b1e..b161f70 100644
INCLUDES = -I ../commons -I ../commons/ocamlextra -I ../globals \
-I $(MENHIR_PATH)
--
-tg: (5935c29..) fixes/system-menhir (depends on: fixes/system-pycaml)
+tg: (d20ea75..) fixes/system-menhir (depends on: fixes/system-pycaml)
diff --git a/debian/patches/fixes/system-ocamlsexp.diff b/debian/patches/fixes/system-ocamlsexp.diff
index 59192ba..ff343d3 100644
--- a/debian/patches/fixes/system-ocamlsexp.diff
+++ b/debian/patches/fixes/system-ocamlsexp.diff
@@ -15,7 +15,7 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
-index bff7065..c932c51 100644
+index b2c2623..d4b24e1 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ SEXPSYSCMA=bigarray.cma nums.cma
@@ -138,4 +138,4 @@ index 6ca4be7..9ef923f 100644
(*****************************************************************************)
(* Test framework *)
--
-tg: (2207fc5..) fixes/system-ocamlsexp (depends on: fixes/system-menhir)
+tg: (526c105..) fixes/system-ocamlsexp (depends on: fixes/system-menhir)
diff --git a/debian/patches/fixes/system-pycaml.diff b/debian/patches/fixes/system-pycaml.diff
index 97cb88f..e3bc377 100644
--- a/debian/patches/fixes/system-pycaml.diff
+++ b/debian/patches/fixes/system-pycaml.diff
@@ -8,11 +8,11 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
---
Makefile | 17 ++++++++---------
python/Makefile | 4 ++--
- python/yes_pycocci.ml | 24 ++++++++++++++++++++----
- 3 files changed, 30 insertions(+), 15 deletions(-)
+ python/yes_pycocci.ml | 2 +-
+ 3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
-index 156318f..892ba07 100644
+index 7d216f6..e76f965 100644
--- a/Makefile
+++ b/Makefile
@@ -34,11 +34,11 @@ TARGET=spatch
@@ -54,7 +54,7 @@ index 156318f..892ba07 100644
engine extra python
INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
globals menhirlib $(PYDIR) ctl \
-@@ -288,7 +288,6 @@ install-python:
+@@ -289,7 +289,6 @@ install-python:
$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
$(INSTALL_DATA) python/coccilib/coccigui/pygui.gladep \
$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
@@ -85,31 +85,10 @@ index 16a9407..0901819 100644
##############################################################################
# Generic ocaml variables
diff --git a/python/yes_pycocci.ml b/python/yes_pycocci.ml
-index 2ef2807..7949d91 100644
+index 8de88e0..6662eb7 100644
--- a/python/yes_pycocci.ml
+++ b/python/yes_pycocci.ml
-@@ -66,6 +66,11 @@ let load_module module_name =
- (* end python module handling part *)
-
- (* initialisation routines *)
-+let _pycocci_setargs argv0 =
-+ let argv = pysequence_list (pytuple_fromsingle (pystring_fromstring argv0)) in
-+ let sys_mod = load_module "sys" in
-+ pyobject_setattrstring (sys_mod, "argv", argv)
-+
- let pycocci_init () =
- (* initialize *)
- if not !initialised then (
-@@ -78,7 +83,7 @@ let pycocci_init () =
-
- (* set argv *)
- let argv0 = Printf.sprintf "%s%sspatch" (Sys.getcwd ()) (match Sys.os_type with "Win32" -> "\\" | _ -> "/") in
-- let _ = pycaml_setargs argv0 in
-+ let _ = _pycocci_setargs argv0 in
-
- coccinelle_module := (pymodule_new "coccinelle");
- module_map := StringMap.add "coccinelle" !coccinelle_module !module_map;
-@@ -107,7 +112,7 @@ let pycocci_get_class_type fqn =
+@@ -103,7 +103,7 @@ let pycocci_get_class_type fqn =
let pycocci_instantiate_class fqn args =
let class_type = pycocci_get_class_type fqn in
@@ -118,47 +97,5 @@ index 2ef2807..7949d91 100644
check_return_value obj;
obj
-@@ -137,13 +142,21 @@ let build_class cname parent methods pymodule =
- check_int_return_value v;
- (cd, cx)
-
-+let _pycocci_true () =
-+ let builtins = pyeval_getbuiltins () in
-+ pyobject_getitem (builtins, pystring_fromstring "True")
-+
-+let _pycocci_false () =
-+ let builtins = pyeval_getbuiltins () in
-+ pyobject_getitem (builtins, pystring_fromstring "False")
-+
- let has_environment_binding env name =
- let a = pytuple_toarray name in
- let (rule, name) = (Array.get a 1, Array.get a 2) in
- let orule = pystring_asstring rule in
- let oname = pystring_asstring name in
- let e = List.exists (function (x,y) -> orule =$= x && oname =$= y) env in
-- if e then pytrue () else pyfalse ()
-+ if e then _pycocci_true () else _pycocci_false ()
-
- let pyoutputinstance = ref (pynone ())
- let pyoutputdict = ref (pynone ())
-@@ -178,6 +191,9 @@ let contains_binding e (_,(r,m)) =
- let _ = List.find (function ((re, rm), _) -> r =$= re && m =$= rm) e in true
- with Not_found -> false
-
-+let _pycocci_tuple6 (a,b,c,d,e,f) =
-+ pytuple_fromarray ([|a; b; c; d; e; f|])
-+
- let construct_variables mv e =
- let find_binding (r,m) =
- try
-@@ -211,7 +227,7 @@ let construct_variables mv e =
- let locs =
- List.map
- (function (fname,current_element,(line,col),(line_end,col_end)) ->
-- pycocci_instantiate_class "coccilib.elems.Location" (pytuple6
-+ pycocci_instantiate_class "coccilib.elems.Location" (_pycocci_tuple6
- (pystring_fromstring fname,pystring_fromstring current_element,
- pystring_fromstring (Printf.sprintf "%d" line),
- pystring_fromstring (Printf.sprintf "%d" col),
--
-tg: (3dd4272..) fixes/system-pycaml (depends on: upstream)
+tg: (9b26161..) fixes/system-pycaml (depends on: upstream)
--
Debian packaging for coccinelle
More information about the Pkg-ocaml-maint-commits
mailing list