[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, patched, updated. debian/0.1.8.deb-1-11-gd17294f
Eugeniy Meshcheryakov
eugen at debian.org
Mon May 11 12:49:45 UTC 2009
The following commit has been merged in the patched branch:
commit d17294f17647d3337100d8245796a19974644722
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Mon May 11 14:48:31 2009 +0200
Patches for version 0.1.8.deb-1
diff --git a/debian/patches/debian/documentation-paths.diff b/debian/patches/debian/documentation-paths.diff
index 4876d94..136ea6f 100644
--- a/debian/patches/debian/documentation-paths.diff
+++ b/debian/patches/debian/documentation-paths.diff
@@ -11,10 +11,10 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/spatch.1 b/docs/spatch.1
-index c38cdc7..b3c1b28 100644
+index 87e0ec8..2448f7c 100644
--- a/docs/spatch.1
+++ b/docs/spatch.1
-@@ -60,10 +60,10 @@ the semantic patch file
+@@ -61,10 +61,10 @@ the semantic patch file
process all files in directory recursively
.TP
.B -iso_file \fI<file>\fP
@@ -27,7 +27,7 @@ index c38cdc7..b3c1b28 100644
.TP
.B -debug
print some information to help debug the matching process
-@@ -117,7 +117,7 @@ show summary of options.
+@@ -118,7 +118,7 @@ show summary of options.
Apply the semantic patch foo.cocci to the C file foo.c. The semantic patch
is applied modulo a set of isomorphisms contained in standard.iso
(standard.iso is by default located in
@@ -36,7 +36,7 @@ index c38cdc7..b3c1b28 100644
the application, if any, will be generated on the standard output.
./spatch -sp_file foo.cocci foo.c -o /tmp/newfoo.c
-@@ -135,18 +135,18 @@ shows selection of information about the application of
+@@ -136,18 +136,18 @@ shows selection of information about the application of
a semantic patch to a file or directory.
.SH FILES
@@ -59,4 +59,4 @@ index c38cdc7..b3c1b28 100644
.SH REFERENCES
Y. Padioleau, J.L. Lawall, R.R Hansen, G. Muller
--
-tg: (ee0f058..) debian/documentation-paths (depends on: master)
+tg: (e5f4a6d..) debian/documentation-paths (depends on: master)
diff --git a/debian/patches/fixes/documentation-build.diff b/debian/patches/fixes/documentation-build.diff
new file mode 100644
index 0000000..17f69c1
--- /dev/null
+++ b/debian/patches/fixes/documentation-build.diff
@@ -0,0 +1,33 @@
+From: Eugeniy Meshcheryakov <eugen at debian.org>
+Subject: [PATCH] fixes/documentation-build
+
+Fix building of documentation (without manual directory)
+
+Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
+
+---
+ docs/Makefile | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/docs/Makefile b/docs/Makefile
+index 91d8e35..89eea99 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -3,12 +3,12 @@ SUBDIR=manual
+ .PHONY: all clean distclean
+
+ all:
+- make -C $(SUBDIR)
++# make -C $(SUBDIR)
+
+ clean:
+- make -C $(SUBDIR) clean
++# make -C $(SUBDIR) clean
+
+ distclean:
+- make -C $(SUBDIR) distclean
++# make -C $(SUBDIR) distclean
+
+
+--
+tg: (220e8c3..) fixes/documentation-build (depends on: upstream)
diff --git a/debian/patches/fixes/system-menhir.diff b/debian/patches/fixes/system-menhir.diff
index 64d4c8c..54e43cf 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 631c43b..e1b883e 100644
+index aeaf9f3..f57fe76 100644
--- a/Makefile
+++ b/Makefile
@@ -59,10 +59,10 @@ LIBS=commons/commons.cma \
@@ -28,10 +28,10 @@ index 631c43b..e1b883e 100644
##############################################################################
diff --git a/parsing_cocci/Makefile b/parsing_cocci/Makefile
-index cf02ae3..8fb2bfe 100644
+index 51a86b4..532c0d4 100644
--- a/parsing_cocci/Makefile
+++ b/parsing_cocci/Makefile
-@@ -40,8 +40,8 @@ get_constants.ml get_constants2.ml parse_cocci.ml
+@@ -40,8 +40,8 @@ get_constants.ml get_constants2.ml adjacency.ml parse_cocci.ml
LIBS=../commons/commons.cma ../globals/globals.cma
SYSLIBS = str.cma unix.cma
@@ -43,4 +43,4 @@ index cf02ae3..8fb2bfe 100644
INCLUDES = -I ../commons -I ../commons/ocamlextra -I ../globals \
-I $(MENHIR_PATH)
--
-tg: (df6f9a4..) fixes/system-menhir (depends on: fixes/system-pycaml)
+tg: (25d7b7a..) 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 3683596..b628056 100644
--- a/debian/patches/fixes/system-ocamlsexp.diff
+++ b/debian/patches/fixes/system-ocamlsexp.diff
@@ -13,7 +13,7 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
-index e1b883e..013c9b3 100644
+index f57fe76..cd974ce 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ SEXPSYSCMA=bigarray.cma nums.cma
@@ -38,7 +38,7 @@ index e1b883e..013c9b3 100644
globals $(PYDIR) ctl \
parsing_cocci parsing_c engine extra python
-@@ -90,8 +90,8 @@ OPTFLAGS=
+@@ -93,8 +93,8 @@ OPTFLAGS=
# but is now defined above in this file
#OPTLIBFLAGS=-cclib dllpycaml_stubs.so
@@ -49,22 +49,22 @@ index e1b883e..013c9b3 100644
OCAMLLEX=ocamllex #-ml # -ml for debugging lexer, but slightly slower
OCAMLYACC=ocamlyacc -v
OCAMLDEP=ocamldep $(INCLUDES)
-@@ -124,13 +124,11 @@ world: all opt
+@@ -133,13 +133,11 @@ top: $(EXEC).top
subdirs:
- $(MAKE) -C commons
-- $(MAKE) -C ocamlsexp
- $(MAKE) -C commons sexp
+ $(MAKE) -C commons OCAMLCFLAGS="$(OCAMLCFLAGS)"
+- $(MAKE) -C ocamlsexp OCAMLCFLAGS="$(OCAMLCFLAGS)"
+ $(MAKE) -C commons sexp OCAMLCFLAGS="$(OCAMLCFLAGS)"
+for D in $(MAKESUBDIRS); do $(MAKE) $$D || exit 1 ; done
subdirs.opt:
- $(MAKE) all.opt -C commons
-- $(MAKE) -C ocamlsexp all.opt
- $(MAKE) -C commons sexp.opt
+ $(MAKE) -C commons all.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
+- $(MAKE) -C ocamlsexp all.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
+ $(MAKE) -C commons sexp.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
+for D in $(MAKESUBDIRS); do $(MAKE) $$D.opt || exit 1 ; done
diff --git a/commons/Makefile b/commons/Makefile
-index 4073a1f..7a76d19 100644
+index ce53152..ee407bb 100644
--- a/commons/Makefile
+++ b/commons/Makefile
@@ -72,7 +72,7 @@ REGEXPINCLUDES=-I ../ocamlpcre/lib -I ../../ocamlpcre/lib
@@ -77,17 +77,19 @@ index 4073a1f..7a76d19 100644
MYBINSRC=bin_common.ml
BININCLUDES=-I ../ocamltarzan/lib-binprot -I ../../ocamltarzan/lib-binprot
diff --git a/commons/sexp_common.ml b/commons/sexp_common.ml
-index ac5b6a8..2f0c6a0 100644
+index 208d760..806c40e 100644
--- a/commons/sexp_common.ml
+++ b/commons/sexp_common.ml
-@@ -1,4 +1,5 @@
+@@ -1,6 +1,7 @@
+ (* automatically generated by ocamltarzan *)
+
open Common
+open Sexplib
let either_of_sexp__ =
let _loc = "Xxx.either"
diff --git a/testing.ml b/testing.ml
-index 8dffbb7..8777859 100644
+index b488d72..ee89772 100644
--- a/testing.ml
+++ b/testing.ml
@@ -21,6 +21,7 @@
@@ -99,4 +101,4 @@ index 8dffbb7..8777859 100644
(*****************************************************************************)
(* Test framework *)
--
-tg: (6adb55e..) fixes/system-ocamlsexp (depends on: fixes/system-menhir)
+tg: (35e77c2..) 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 fa04337..dc6748c 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, 26 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
-index 551e7c2..631c43b 100644
+index 78923d7..aeaf9f3 100644
--- a/Makefile
+++ b/Makefile
@@ -34,11 +34,11 @@ TARGET=spatch
@@ -32,13 +32,13 @@ index 551e7c2..631c43b 100644
else
PYCMA=
PYDIR=
-@@ -229,7 +229,6 @@ install-python:
+@@ -288,7 +288,6 @@ install-python:
$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
$(INSTALL_DATA) python/coccilib/coccigui/pygui.gladep \
$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
- $(INSTALL_LIB) dllpycaml_stubs.so $(DESTDIR)$(LIBDIR)
- install:
+ install: install-common
@if test -x spatch -a ! -x spatch.opt ; then \
diff --git a/python/Makefile b/python/Makefile
index 16a9407..33e2642 100644
@@ -130,4 +130,4 @@ index 2ef2807..7949d91 100644
pystring_fromstring (Printf.sprintf "%d" line),
pystring_fromstring (Printf.sprintf "%d" col),
--
-tg: (0f08eb3..) fixes/system-pycaml (depends on: upstream)
+tg: (220e8c3..) fixes/system-pycaml (depends on: upstream)
diff --git a/debian/patches/fixes/unsafe-tmp-handling.diff b/debian/patches/fixes/unsafe-tmp-handling.diff
index 7f77d2d..924ba44 100644
--- a/debian/patches/fixes/unsafe-tmp-handling.diff
+++ b/debian/patches/fixes/unsafe-tmp-handling.diff
@@ -10,20 +10,20 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/main.ml b/main.ml
-index 52096bb..2619091 100644
+index 7aa9ab5..02b4357 100644
--- a/main.ml
+++ b/main.ml
-@@ -740,9 +740,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
+@@ -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: (0f08eb3..) fixes/unsafe-tmp-handling (depends on: upstream)
+tg: (220e8c3..) fixes/unsafe-tmp-handling (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index 0ce0697..c041c00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fixes/system-menhir.diff -p1
fixes/system-pycaml.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