[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, patched, updated. debian/0.1.9.deb-1-17-g816f235
Eugeniy Meshcheryakov
eugen at debian.org
Sun Aug 9 19:09:26 UTC 2009
The following commit has been merged in the patched branch:
commit 816f2355e2ef663daf1f4ab5b2ed14a1972f7f1a
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Sun Aug 9 21:08:38 2009 +0200
Patches for version 0.1.9.deb-1
diff --git a/debian/patches/debian/documentation-paths.diff b/debian/patches/debian/documentation-paths.diff
index 136ea6f..3958c97 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: (e5f4a6d..) debian/documentation-paths (depends on: master)
+tg: (8e6fb7c..) debian/documentation-paths (depends on: master)
diff --git a/debian/patches/fixes/documentation-build.diff b/debian/patches/fixes/documentation-build.diff
index 17f69c1..f8cf92b 100644
--- a/debian/patches/fixes/documentation-build.diff
+++ b/debian/patches/fixes/documentation-build.diff
@@ -30,4 +30,4 @@ index 91d8e35..89eea99 100644
--
-tg: (220e8c3..) fixes/documentation-build (depends on: upstream)
+tg: (3dd4272..) fixes/documentation-build (depends on: upstream)
diff --git a/debian/patches/fixes/system-menhir.diff b/debian/patches/fixes/system-menhir.diff
index 02dea24..99e91dc 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 bc61bcc..ac2f8cb 100644
+index 892ba07..bff7065 100644
--- a/Makefile
+++ b/Makefile
@@ -59,10 +59,10 @@ LIBS=commons/commons.cma \
@@ -28,7 +28,7 @@ index bc61bcc..ac2f8cb 100644
##############################################################################
diff --git a/parsing_cocci/Makefile b/parsing_cocci/Makefile
-index 51a86b4..532c0d4 100644
+index 9522b1e..b161f70 100644
--- a/parsing_cocci/Makefile
+++ b/parsing_cocci/Makefile
@@ -40,8 +40,8 @@ get_constants.ml get_constants2.ml adjacency.ml parse_cocci.ml
@@ -43,4 +43,4 @@ index 51a86b4..532c0d4 100644
INCLUDES = -I ../commons -I ../commons/ocamlextra -I ../globals \
-I $(MENHIR_PATH)
--
-tg: (1394072..) fixes/system-menhir (depends on: fixes/system-pycaml)
+tg: (5935c29..) 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 2e5178a..59192ba 100644
--- a/debian/patches/fixes/system-ocamlsexp.diff
+++ b/debian/patches/fixes/system-ocamlsexp.diff
@@ -6,14 +6,16 @@ Use Debian's ocamlsexp
Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
---
- Makefile | 12 +++++-------
- commons/Makefile | 2 +-
- commons/sexp_common.ml | 1 +
- testing.ml | 1 +
- 4 files changed, 8 insertions(+), 8 deletions(-)
+ Makefile | 12 +++++-------
+ commons/Makefile | 2 +-
+ commons/sexp_common.ml | 1 +
+ parsing_c/Makefile | 6 +++---
+ parsing_c/sexp_ast_c.ml | 1 +
+ testing.ml | 1 +
+ 6 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
-index ac2f8cb..e1e59cc 100644
+index bff7065..c932c51 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ SEXPSYSCMA=bigarray.cma nums.cma
@@ -64,7 +66,7 @@ index ac2f8cb..e1e59cc 100644
+for D in $(MAKESUBDIRS); do $(MAKE) $$D.opt || exit 1 ; done
diff --git a/commons/Makefile b/commons/Makefile
-index ce53152..ee407bb 100644
+index 081bb1a..4813a6a 100644
--- a/commons/Makefile
+++ b/commons/Makefile
@@ -72,7 +72,7 @@ REGEXPINCLUDES=-I ../ocamlpcre/lib -I ../../ocamlpcre/lib
@@ -88,8 +90,43 @@ index 208d760..806c40e 100644
let either_of_sexp__ =
let _loc = "Xxx.either"
+diff --git a/parsing_c/Makefile b/parsing_c/Makefile
+index 04a03c3..3274ca7 100644
+--- a/parsing_c/Makefile
++++ b/parsing_c/Makefile
+@@ -10,7 +10,7 @@ TARGET=parsing_c
+
+ ifeq ($(FEATURE_TARZAN), 1)
+ TARZANSRC=sexp_ast_c.ml
+-TARZANINCLUDE=-I ../ocamlsexp
++#TARZANINCLUDE=-I ../ocamlsexp
+ endif
+
+
+@@ -62,8 +62,8 @@ SYSLIBS= str.cma unix.cma num.cma
+ #for profiling: -p -inline 0 with OCAMLOPT
+ OCAMLCFLAGS ?= -g -dtypes
+
+-OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES)
+-OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES)
++OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
++OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
+ OCAMLLEX=ocamllex$(OPTBIN) #-ml
+ OCAMLYACC=ocamlyacc -v
+ OCAMLDEP=ocamldep$(OPTBIN) $(INCLUDES)
+diff --git a/parsing_c/sexp_ast_c.ml b/parsing_c/sexp_ast_c.ml
+index 4c6f2aa..a7a1425 100644
+--- a/parsing_c/sexp_ast_c.ml
++++ b/parsing_c/sexp_ast_c.ml
+@@ -1,5 +1,6 @@
+ (* generated by ocamltarzan with: camlp4o -o /tmp/yyy.ml -I pa/ pa_type_conv.cmo pa_sexp_conv.cmo pr_o.cmo /tmp/xxx.ml *)
+ open Ast_c
++open Sexplib
+
+ (*
+ let sexp_of_program x =
diff --git a/testing.ml b/testing.ml
-index b488d72..ee89772 100644
+index 6ca4be7..9ef923f 100644
--- a/testing.ml
+++ b/testing.ml
@@ -21,6 +21,7 @@
@@ -101,4 +138,4 @@ index b488d72..ee89772 100644
(*****************************************************************************)
(* Test framework *)
--
-tg: (70da999..) fixes/system-ocamlsexp (depends on: fixes/system-menhir)
+tg: (2207fc5..) 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 526a08f..97cb88f 100644
--- a/debian/patches/fixes/system-pycaml.diff
+++ b/debian/patches/fixes/system-pycaml.diff
@@ -12,7 +12,7 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
3 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
-index 78923d7..bc61bcc 100644
+index 156318f..892ba07 100644
--- a/Makefile
+++ b/Makefile
@@ -34,11 +34,11 @@ TARGET=spatch
@@ -161,4 +161,4 @@ index 2ef2807..7949d91 100644
pystring_fromstring (Printf.sprintf "%d" line),
pystring_fromstring (Printf.sprintf "%d" col),
--
-tg: (220e8c3..) fixes/system-pycaml (depends on: upstream)
+tg: (3dd4272..) fixes/system-pycaml (depends on: upstream)
diff --git a/debian/patches/fixes/unsafe-tmp-handling.diff b/debian/patches/fixes/unsafe-tmp-handling.diff
deleted file mode 100644
index 924ba44..0000000
--- a/debian/patches/fixes/unsafe-tmp-handling.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Eugeniy Meshcheryakov <eugen at debian.org>
-Subject: [PATCH] fixes/unsafe-tmp-handling
-
-Patch fixes unsafe temporary file handling (reported to upstream).
-
-Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
-
----
- main.ml | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/main.ml b/main.ml
-index 7aa9ab5..02b4357 100644
---- a/main.ml
-+++ b/main.ml
-@@ -798,9 +798,11 @@ let main_action xs =
-
- if !output_file =$= ""
- then begin
-+ (*
- let tmpfile = "/tmp/"^Common.basename infile in
- pr2 (spf "One file modified. Result is here: %s" tmpfile);
- Common.command2 ("cp "^outfile^" "^tmpfile);
-+ *)
- end
- ));
- if !output_file <> "" then
---
-tg: (220e8c3..) fixes/unsafe-tmp-handling (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index 8df09eb..3d6822a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ debian/documentation-paths.diff -p1
fixes/system-pycaml.diff -p1
fixes/system-menhir.diff -p1
fixes/system-ocamlsexp.diff -p1
-fixes/unsafe-tmp-handling.diff -p1
fixes/documentation-build.diff -p1
--
Debian packaging for coccinelle
More information about the Pkg-ocaml-maint-commits
mailing list