[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.2.deb-2-19-gf3e1171
Eugeniy Meshcheryakov
eugen at debian.org
Sun Jul 25 15:56:03 UTC 2010
The following commit has been merged in the master branch:
commit 220218896cb2256ed40247ef9317d358b137c153
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Sat Jul 24 22:02:41 2010 +0200
Removed patches:
* Removed patches:
- system-{pycaml,menhir,ocamlsexp}.diff - upstream build system can handle
this
diff --git a/debian/changelog b/debian/changelog
index 14fa5da..874c09c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
coccinelle (0.2.3.deb-1) unstable; urgency=low
* New upstream release
+ * Removed patches:
+ - system-{pycaml,menhir,ocamlsexp}.diff - upstream build system can handle
+ this
- -- Євгеній Мещеряков <eugen at debian.org> Sat, 24 Jul 2010 21:59:55 +0200
+ -- Євгеній Мещеряков <eugen at debian.org> Sat, 24 Jul 2010 22:01:36 +0200
coccinelle (0.2.2.deb-2) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 5eda4a8..c673f1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
documentation-paths.diff
-system-pycaml.diff
-system-menhir.diff
-system-ocamlsexp.diff
documentation-build.diff
diff --git a/debian/patches/system-menhir.diff b/debian/patches/system-menhir.diff
deleted file mode 100644
index 179a31d..0000000
--- a/debian/patches/system-menhir.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Eugeniy Meshcheryakov <eugen at debian.org>
-Subject: [PATCH] use system menhir for building
-
-Use Debian's menhir package for building
-
-Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
-
----
- Makefile | 4 ++--
- parsing_cocci/Makefile | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-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 popl09 extra python
- INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
-- globals menhirlib $(PYDIR) ctl \
-+ globals $(PYDIR) ctl \
- parsing_cocci parsing_c engine popl09 extra python
-
- ##############################################################################
-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
-
--#MENHIR_PATH=$(shell ocamlfind query menhirLib)
--MENHIR_PATH=../menhirlib
-+MENHIR_PATH=$(shell ocamlfind query menhirLib)
-+#MENHIR_PATH=../menhirlib
-
- INCLUDES = -I ../commons -I ../commons/ocamlextra -I ../globals \
- -I $(MENHIR_PATH)
diff --git a/debian/patches/system-ocamlsexp.diff b/debian/patches/system-ocamlsexp.diff
deleted file mode 100644
index 41f3bdf..0000000
--- a/debian/patches/system-ocamlsexp.diff
+++ /dev/null
@@ -1,139 +0,0 @@
-From: Eugeniy Meshcheryakov <eugen at debian.org>
-Subject: [PATCH] fixes/system-ocamlsexp
-
-Use Debian's ocamlsexp
-
-Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
-
----
- 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(-)
-
-Index: coccinelle/Makefile
-===================================================================
---- coccinelle.orig/Makefile 2010-01-31 16:20:24.375015258 +0100
-+++ coccinelle/Makefile 2010-01-31 16:20:25.701654846 +0100
-@@ -52,7 +52,7 @@
-
- SYSLIBS=str.cma unix.cma $(PYCMA) $(SEXPSYSCMA)
- LIBS=commons/commons.cma \
-- ocamlsexp/sexplib1.cma commons/commons_sexp.cma \
-+ sexplib.cma commons/commons_sexp.cma \
- globals/globals.cma \
- ctl/ctl.cma \
- parsing_cocci/cocci_parser.cma parsing_c/parsing_c.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 popl09 extra python
--INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
-+INCLUDEDIRS=commons commons/ocamlextra \
- globals $(PYDIR) ctl \
- parsing_cocci parsing_c engine popl09 extra python
-
-@@ -95,8 +95,8 @@
- # but is now defined above in this file
- #OPTLIBFLAGS=-cclib dllpycaml_stubs.so
-
--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 #-ml # -ml for debugging lexer, but slightly slower
- OCAMLYACC=ocamlyacc -v
- OCAMLDEP=ocamldep $(INCLUDES)
-@@ -135,13 +135,11 @@
-
- subdirs:
- $(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) -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
-
-Index: coccinelle/commons/Makefile
-===================================================================
---- coccinelle.orig/commons/Makefile 2010-01-31 16:16:33.415867174 +0100
-+++ coccinelle/commons/Makefile 2010-01-31 16:20:25.701654846 +0100
-@@ -72,7 +72,7 @@
-
- #sexplib
- MYSEXPSRC=sexp_common.ml
--SEXPINCLUDES=-I ../ocamlsexp -I ../ocamltarzan/lib-sexp -I ../../ocamltarzan/lib-sexp
-+SEXPINCLUDES=-I `ocamlfind query sexplib` -I ../ocamltarzan/lib-sexp -I ../../ocamltarzan/lib-sexp
- #binprot
- MYBINSRC=bin_common.ml
- BININCLUDES=-I ../ocamltarzan/lib-binprot -I ../../ocamltarzan/lib-binprot
-Index: coccinelle/commons/sexp_common.ml
-===================================================================
---- coccinelle.orig/commons/sexp_common.ml 2010-01-31 16:16:33.375866493 +0100
-+++ coccinelle/commons/sexp_common.ml 2010-01-31 16:20:25.701654846 +0100
-@@ -1,6 +1,7 @@
- (* automatically generated by ocamltarzan *)
-
- open Common
-+open Sexplib
-
- let either_of_sexp__ =
- let _loc = "Xxx.either"
-Index: coccinelle/parsing_c/Makefile
-===================================================================
---- coccinelle.orig/parsing_c/Makefile 2010-01-31 16:16:33.509201601 +0100
-+++ coccinelle/parsing_c/Makefile 2010-01-31 16:20:25.701654846 +0100
-@@ -10,7 +10,7 @@
-
- ifeq ($(FEATURE_TARZAN), 1)
- TARZANSRC=sexp_ast_c.ml
--TARZANINCLUDE=-I ../ocamlsexp
-+#TARZANINCLUDE=-I ../ocamlsexp
- endif
-
-
-@@ -62,8 +62,8 @@
- #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)
-Index: coccinelle/parsing_c/sexp_ast_c.ml
-===================================================================
---- coccinelle.orig/parsing_c/sexp_ast_c.ml 2010-01-31 16:16:33.489200772 +0100
-+++ coccinelle/parsing_c/sexp_ast_c.ml 2010-01-31 16:20:25.704980394 +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
-+open Sexplib
-
- (*
- let sexp_of_program x =
-Index: coccinelle/testing.ml
-===================================================================
---- coccinelle.orig/testing.ml 2010-01-31 16:16:33.439208254 +0100
-+++ coccinelle/testing.ml 2010-01-31 16:20:25.704980394 +0100
-@@ -21,6 +21,7 @@
-
-
- open Common
-+open Sexplib
-
- (*****************************************************************************)
- (* Test framework *)
diff --git a/debian/patches/system-pycaml.diff b/debian/patches/system-pycaml.diff
deleted file mode 100644
index 06b07d8..0000000
--- a/debian/patches/system-pycaml.diff
+++ /dev/null
@@ -1,109 +0,0 @@
-From: Eugeniy Meshcheryakov <eugen at debian.org>
-Subject: [PATCH] use system pycaml for building
-
-Use Debian's pycaml instead of included one
-
-Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
-
----
- Makefile | 17 ++++++++---------
- python/Makefile | 4 ++--
- python/yes_pycocci.ml | 2 +-
- 3 files changed, 11 insertions(+), 12 deletions(-)
-
-Index: coccinelle/Makefile
-===================================================================
---- coccinelle.orig/Makefile 2010-03-15 21:00:10.000000000 +0100
-+++ coccinelle/Makefile 2010-06-21 14:41:15.562472600 +0200
-@@ -40,11 +40,11 @@
- SRC=flag_cocci.ml cocci.ml testing.ml test.ml main.ml
-
- ifeq ($(FEATURE_PYTHON),1)
--PYCMA=pycaml/pycaml.cma
--PYDIR=pycaml
--PYLIB=dllpycaml_stubs.so
--# the following is essential for Coccinelle to compile under gentoo (weird)
--OPTLIBFLAGS=-cclib dllpycaml_stubs.so
-+PYCMA=pycaml.cma
-+PYDIR=$(shell ocamlfind query pycaml)
-+PYLIB=
-+# the following is essential for Coccinelle to compile under gentoo (wierd)
-+OPTLIBFLAGS=
- else
- PYCMA=
- PYDIR=
-@@ -54,18 +54,18 @@
-
- SEXPSYSCMA=bigarray.cma nums.cma
-
--SYSLIBS=str.cma unix.cma $(SEXPSYSCMA)
-+SYSLIBS=str.cma unix.cma $(PYCMA) $(SEXPSYSCMA)
- LIBS=commons/commons.cma \
- ocamlsexp/sexplib1.cma commons/commons_sexp.cma \
- globals/globals.cma \
- ctl/ctl.cma \
- parsing_cocci/cocci_parser.cma parsing_c/parsing_c.cma \
- engine/cocciengine.cma popl09/popl.cma \
-- extra/extra.cma $(PYCMA) python/coccipython.cma
-+ extra/extra.cma python/coccipython.cma
-
- #used for clean: and depend: and a little for rec & rec.opt
- MAKESUBDIRS=commons ocamlsexp \
-- globals menhirlib $(PYDIR) ctl parsing_cocci parsing_c \
-+ globals menhirlib ctl parsing_cocci parsing_c \
- engine popl09 extra python
- INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
- globals menhirlib $(PYDIR) ctl \
-@@ -294,7 +294,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
- @if test -x spatch -a ! -x spatch.opt ; then \
-Index: coccinelle/python/Makefile
-===================================================================
---- coccinelle.orig/python/Makefile 2010-03-12 16:34:05.000000000 +0100
-+++ coccinelle/python/Makefile 2010-06-21 14:42:36.340445286 +0200
-@@ -30,7 +30,7 @@
-
- SOURCES= pycocci_aux.ml pycocci.ml
-
--INCLUDEDIRS = ../commons ../commons/ocamlextra ../globals ../pycaml \
-+INCLUDEDIRS = ../commons ../commons/ocamlextra ../globals \
- ../parsing_c ../parsing_cocci
-
- SYSLIBS = str.cma unix.cma
-@@ -45,7 +45,8 @@
- # Generic variables
- ##############################################################################
-
--INCLUDES=$(INCLUDEDIRS:%=-I %) $(INCLUDESEXTRA)
-+LOCAL_INCLUDES=$(INCLUDEDIRS:%=-I %) $(INCLUDESEXTRA)
-+INCLUDES=$(LOCAL_INCLUDES) -I $(shell ocamlfind query pycaml)
-
- ##############################################################################
- # Generic ocaml variables
-@@ -55,7 +56,7 @@
- OCAMLCFLAGS ?= -g -dtypes
- OCAMLC =ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES)
- OCAMLOPT = ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES)
--OCAMLDEP = ocamldep$(OPTBIN) $(INCLUDES)
-+OCAMLDEP = ocamldep$(OPTBIN) $(LOCAL_INCLUDES)
-
-
- ##############################################################################
-Index: coccinelle/python/yes_pycocci.ml
-===================================================================
---- coccinelle.orig/python/yes_pycocci.ml 2010-03-12 16:34:05.000000000 +0100
-+++ coccinelle/python/yes_pycocci.ml 2010-06-21 14:41:15.562472600 +0200
-@@ -105,7 +105,7 @@
-
- let pycocci_instantiate_class fqn args =
- let class_type = pycocci_get_class_type fqn in
-- let obj = pyobject_callobject(class_type, args) in
-+ let obj = pyeval_callobject(class_type, args) in
- check_return_value obj;
- obj
-
--
Debian packaging for coccinelle
More information about the Pkg-ocaml-maint-commits
mailing list