[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.1.9.deb-1-18-g96329a6
Eugeniy Meshcheryakov
eugen at debian.org
Tue Jan 19 22:50:45 UTC 2010
The following commit has been merged in the master branch:
commit 4d885686fcf085d8c4ea9677bd300d5507d98a3f
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Tue Jan 19 22:46:22 2010 +0100
Updated patches:
* Updated patches:
- system-menhir.diff
- system-ocamlsexp.diff
- system-pycaml.diff
diff --git a/debian/changelog b/debian/changelog
index ad26a44..561f508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ coccinelle (0.2.0.deb-1) unstable; urgency=low
* New upstream release
* Do not use topgit and quilt. Convert package to source format 3.0 (quilt)
+ * Updated patches:
+ - system-menhir.diff
+ - system-ocamlsexp.diff
+ - system-pycaml.diff
- -- Євгеній Мещеряков <eugen at debian.org> Tue, 19 Jan 2010 22:37:03 +0100
+ -- Євгеній Мещеряков <eugen at debian.org> Tue, 19 Jan 2010 22:45:35 +0100
coccinelle (0.1.10.deb-1) unstable; urgency=low
diff --git a/debian/patches/system-menhir.diff b/debian/patches/system-menhir.diff
index ed0741b..179a31d 100644
--- a/debian/patches/system-menhir.diff
+++ b/debian/patches/system-menhir.diff
@@ -10,28 +10,28 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
parsing_cocci/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/Makefile b/Makefile
-index e76f965..b2c2623 100644
---- a/Makefile
-+++ b/Makefile
-@@ -59,10 +59,10 @@ LIBS=commons/commons.cma \
+Index: coccinelle/Makefile
+===================================================================
+--- coccinelle.orig/Makefile 2010-01-19 22:42:21.000000000 +0100
++++ coccinelle/Makefile 2010-01-19 22:43:45.719359810 +0100
+@@ -61,10 +61,10 @@
#used for clean: and depend: and a little for rec & rec.opt
MAKESUBDIRS=commons ocamlsexp \
- globals menhirlib ctl parsing_cocci parsing_c \
+ globals ctl parsing_cocci parsing_c \
- engine extra python
+ engine popl09 extra python
INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
- globals menhirlib $(PYDIR) ctl \
+ globals $(PYDIR) ctl \
- parsing_cocci parsing_c engine extra python
+ parsing_cocci parsing_c engine popl09 extra python
##############################################################################
-diff --git a/parsing_cocci/Makefile b/parsing_cocci/Makefile
-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
+Index: coccinelle/parsing_cocci/Makefile
+===================================================================
+--- coccinelle.orig/parsing_cocci/Makefile 2010-01-19 22:26:52.000000000 +0100
++++ coccinelle/parsing_cocci/Makefile 2010-01-19 22:43:00.341683641 +0100
+@@ -40,8 +40,8 @@
LIBS=../commons/commons.cma ../globals/globals.cma
SYSLIBS = str.cma unix.cma
@@ -42,5 +42,3 @@ index 9522b1e..b161f70 100644
INCLUDES = -I ../commons -I ../commons/ocamlextra -I ../globals \
-I $(MENHIR_PATH)
---
-tg: (d20ea75..) fixes/system-menhir (depends on: fixes/system-pycaml)
diff --git a/debian/patches/system-ocamlsexp.diff b/debian/patches/system-ocamlsexp.diff
index ff343d3..3c1ee2a 100644
--- a/debian/patches/system-ocamlsexp.diff
+++ b/debian/patches/system-ocamlsexp.diff
@@ -14,11 +14,11 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
testing.ml | 1 +
6 files changed, 12 insertions(+), 11 deletions(-)
-diff --git a/Makefile b/Makefile
-index b2c2623..d4b24e1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -50,7 +50,7 @@ SEXPSYSCMA=bigarray.cma nums.cma
+Index: coccinelle/Makefile
+===================================================================
+--- coccinelle.orig/Makefile 2010-01-19 22:43:45.000000000 +0100
++++ coccinelle/Makefile 2010-01-19 22:44:43.738515130 +0100
+@@ -52,7 +52,7 @@
SYSLIBS=str.cma unix.cma $(PYCMA) $(SEXPSYSCMA)
LIBS=commons/commons.cma \
@@ -27,20 +27,20 @@ index b2c2623..d4b24e1 100644
globals/globals.cma \
ctl/ctl.cma \
parsing_cocci/cocci_parser.cma parsing_c/parsing_c.cma \
-@@ -58,10 +58,10 @@ LIBS=commons/commons.cma \
+@@ -60,10 +60,10 @@
extra/extra.cma python/coccipython.cma
#used for clean: and depend: and a little for rec & rec.opt
-MAKESUBDIRS=commons ocamlsexp \
+MAKESUBDIRS=commons \
globals ctl parsing_cocci parsing_c \
- engine extra python
+ engine popl09 extra python
-INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
+INCLUDEDIRS=commons commons/ocamlextra \
globals $(PYDIR) ctl \
- parsing_cocci parsing_c engine extra python
+ parsing_cocci parsing_c engine popl09 extra python
-@@ -93,8 +93,8 @@ OPTFLAGS=
+@@ -95,8 +95,8 @@
# but is now defined above in this file
#OPTLIBFLAGS=-cclib dllpycaml_stubs.so
@@ -51,7 +51,7 @@ index b2c2623..d4b24e1 100644
OCAMLLEX=ocamllex #-ml # -ml for debugging lexer, but slightly slower
OCAMLYACC=ocamlyacc -v
OCAMLDEP=ocamldep $(INCLUDES)
-@@ -133,13 +133,11 @@ top: $(EXEC).top
+@@ -135,13 +135,11 @@
subdirs:
$(MAKE) -C commons OCAMLCFLAGS="$(OCAMLCFLAGS)"
@@ -65,11 +65,11 @@ index b2c2623..d4b24e1 100644
$(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 081bb1a..4813a6a 100644
---- a/commons/Makefile
-+++ b/commons/Makefile
-@@ -72,7 +72,7 @@ REGEXPINCLUDES=-I ../ocamlpcre/lib -I ../../ocamlpcre/lib
+Index: coccinelle/commons/Makefile
+===================================================================
+--- coccinelle.orig/commons/Makefile 2009-05-09 07:22:28.000000000 +0200
++++ coccinelle/commons/Makefile 2010-01-19 22:44:18.041676782 +0100
+@@ -72,7 +72,7 @@
#sexplib
MYSEXPSRC=sexp_common.ml
@@ -78,10 +78,10 @@ index 081bb1a..4813a6a 100644
#binprot
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 208d760..806c40e 100644
---- a/commons/sexp_common.ml
-+++ b/commons/sexp_common.ml
+Index: coccinelle/commons/sexp_common.ml
+===================================================================
+--- coccinelle.orig/commons/sexp_common.ml 2009-04-16 18:24:29.000000000 +0200
++++ coccinelle/commons/sexp_common.ml 2010-01-19 22:44:18.041676782 +0100
@@ -1,6 +1,7 @@
(* automatically generated by ocamltarzan *)
@@ -90,11 +90,11 @@ 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
+Index: coccinelle/parsing_c/Makefile
+===================================================================
+--- coccinelle.orig/parsing_c/Makefile 2009-07-24 12:52:14.000000000 +0200
++++ coccinelle/parsing_c/Makefile 2010-01-19 22:44:18.041676782 +0100
+@@ -10,7 +10,7 @@
ifeq ($(FEATURE_TARZAN), 1)
TARZANSRC=sexp_ast_c.ml
@@ -103,7 +103,7 @@ index 04a03c3..3274ca7 100644
endif
-@@ -62,8 +62,8 @@ SYSLIBS= str.cma unix.cma num.cma
+@@ -62,8 +62,8 @@
#for profiling: -p -inline 0 with OCAMLOPT
OCAMLCFLAGS ?= -g -dtypes
@@ -114,10 +114,10 @@ index 04a03c3..3274ca7 100644
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
+Index: coccinelle/parsing_c/sexp_ast_c.ml
+===================================================================
+--- coccinelle.orig/parsing_c/sexp_ast_c.ml 2009-07-24 12:52:05.000000000 +0200
++++ coccinelle/parsing_c/sexp_ast_c.ml 2010-01-19 22:44:18.045013111 +0100
@@ -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
@@ -125,10 +125,10 @@ index 4c6f2aa..a7a1425 100644
(*
let sexp_of_program x =
-diff --git a/testing.ml b/testing.ml
-index 6ca4be7..9ef923f 100644
---- a/testing.ml
-+++ b/testing.ml
+Index: coccinelle/testing.ml
+===================================================================
+--- coccinelle.orig/testing.ml 2010-01-19 22:26:52.000000000 +0100
++++ coccinelle/testing.ml 2010-01-19 22:44:18.045013111 +0100
@@ -21,6 +21,7 @@
@@ -137,5 +137,3 @@ index 6ca4be7..9ef923f 100644
(*****************************************************************************)
(* Test framework *)
---
-tg: (526c105..) fixes/system-ocamlsexp (depends on: fixes/system-menhir)
diff --git a/debian/patches/system-pycaml.diff b/debian/patches/system-pycaml.diff
index e3bc377..9793a81 100644
--- a/debian/patches/system-pycaml.diff
+++ b/debian/patches/system-pycaml.diff
@@ -11,11 +11,11 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
python/yes_pycocci.ml | 2 +-
3 files changed, 11 insertions(+), 12 deletions(-)
-diff --git a/Makefile b/Makefile
-index 7d216f6..e76f965 100644
---- a/Makefile
-+++ b/Makefile
-@@ -34,11 +34,11 @@ TARGET=spatch
+Index: coccinelle/Makefile
+===================================================================
+--- coccinelle.orig/Makefile 2010-01-19 22:26:52.000000000 +0100
++++ coccinelle/Makefile 2010-01-19 22:42:21.948796239 +0100
+@@ -36,11 +36,11 @@
SRC=flag_cocci.ml cocci.ml testing.ml test.ml main.ml
ifeq ($(FEATURE_PYTHON),1)
@@ -32,7 +32,7 @@ index 7d216f6..e76f965 100644
else
PYCMA=
PYDIR=
-@@ -48,18 +48,18 @@ endif
+@@ -50,18 +50,18 @@
SEXPSYSCMA=bigarray.cma nums.cma
@@ -43,7 +43,7 @@ index 7d216f6..e76f965 100644
globals/globals.cma \
ctl/ctl.cma \
parsing_cocci/cocci_parser.cma parsing_c/parsing_c.cma \
- engine/cocciengine.cma \
+ engine/cocciengine.cma popl09/popl.cma \
- extra/extra.cma $(PYCMA) python/coccipython.cma
+ extra/extra.cma python/coccipython.cma
@@ -51,22 +51,22 @@ index 7d216f6..e76f965 100644
MAKESUBDIRS=commons ocamlsexp \
- globals menhirlib $(PYDIR) ctl parsing_cocci parsing_c \
+ globals menhirlib ctl parsing_cocci parsing_c \
- engine extra python
+ engine popl09 extra python
INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
globals menhirlib $(PYDIR) ctl \
-@@ -289,7 +289,6 @@ install-python:
+@@ -289,7 +289,6 @@
$(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-common
+ install: install-common
@if test -x spatch -a ! -x spatch.opt ; then \
-diff --git a/python/Makefile b/python/Makefile
-index 16a9407..0901819 100644
---- a/python/Makefile
-+++ b/python/Makefile
-@@ -30,7 +30,7 @@ TARGET=coccipython
+Index: coccinelle/python/Makefile
+===================================================================
+--- coccinelle.orig/python/Makefile 2010-01-19 22:26:52.000000000 +0100
++++ coccinelle/python/Makefile 2010-01-19 22:40:58.719197899 +0100
+@@ -30,7 +30,7 @@
SOURCES= pycocci_aux.ml pycocci.ml
@@ -75,7 +75,7 @@ index 16a9407..0901819 100644
../parsing_c ../parsing_cocci
SYSLIBS = str.cma unix.cma
-@@ -45,7 +45,7 @@ LIBS=../commons/commons.cma ../globals/globals.cma
+@@ -45,7 +45,7 @@
# Generic variables
##############################################################################
@@ -84,11 +84,11 @@ index 16a9407..0901819 100644
##############################################################################
# Generic ocaml variables
-diff --git a/python/yes_pycocci.ml b/python/yes_pycocci.ml
-index 8de88e0..6662eb7 100644
---- a/python/yes_pycocci.ml
-+++ b/python/yes_pycocci.ml
-@@ -103,7 +103,7 @@ let pycocci_get_class_type fqn =
+Index: coccinelle/python/yes_pycocci.ml
+===================================================================
+--- coccinelle.orig/python/yes_pycocci.ml 2010-01-19 22:26:52.000000000 +0100
++++ coccinelle/python/yes_pycocci.ml 2010-01-19 22:40:58.719197899 +0100
+@@ -127,7 +127,7 @@
let pycocci_instantiate_class fqn args =
let class_type = pycocci_get_class_type fqn in
@@ -97,5 +97,3 @@ index 8de88e0..6662eb7 100644
check_return_value obj;
obj
---
-tg: (9b26161..) fixes/system-pycaml (depends on: upstream)
--
Debian packaging for coccinelle
More information about the Pkg-ocaml-maint-commits
mailing list