[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, patched, updated. patched/0.1.8.deb-3-4-g0d4e05e
Eugeniy Meshcheryakov
eugen at debian.org
Fri Jun 12 11:40:13 UTC 2009
The following commit has been merged in the patched branch:
commit 0d4e05e402e8a29582743703e7143f5423a89fa6
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Fri Jun 12 13:38:33 2009 +0200
Patches for version 0.1.8.deb-4
diff --git a/debian/patches/fixes/system-menhir.diff b/debian/patches/fixes/system-menhir.diff
index 24ab372..02dea24 100644
--- a/debian/patches/fixes/system-menhir.diff
+++ b/debian/patches/fixes/system-menhir.diff
@@ -11,15 +11,15 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index 05b140f..49a2a35 100644
+index bc61bcc..ac2f8cb 100644
--- a/Makefile
+++ b/Makefile
@@ -59,10 +59,10 @@ LIBS=commons/commons.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 $(PYDIR) ctl parsing_cocci parsing_c \
+- globals menhirlib ctl parsing_cocci parsing_c \
++ globals ctl parsing_cocci parsing_c \
engine extra python
INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
- globals menhirlib $(PYDIR) ctl \
@@ -43,4 +43,4 @@ index 51a86b4..532c0d4 100644
INCLUDES = -I ../commons -I ../commons/ocamlextra -I ../globals \
-I $(MENHIR_PATH)
--
-tg: (03b520a..) fixes/system-menhir (depends on: fixes/system-pycaml)
+tg: (1394072..) 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 8dfdcb7..2e5178a 100644
--- a/debian/patches/fixes/system-ocamlsexp.diff
+++ b/debian/patches/fixes/system-ocamlsexp.diff
@@ -13,12 +13,12 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
-index 49a2a35..d0f28a1 100644
+index ac2f8cb..e1e59cc 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ 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 \
+ sexplib.cma commons/commons_sexp.cma \
@@ -26,12 +26,12 @@ index 49a2a35..d0f28a1 100644
ctl/ctl.cma \
parsing_cocci/cocci_parser.cma parsing_c/parsing_c.cma \
@@ -58,10 +58,10 @@ LIBS=commons/commons.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 \
+MAKESUBDIRS=commons \
- globals $(PYDIR) ctl parsing_cocci parsing_c \
+ globals ctl parsing_cocci parsing_c \
engine extra python
-INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
+INCLUDEDIRS=commons commons/ocamlextra \
@@ -101,4 +101,4 @@ index b488d72..ee89772 100644
(*****************************************************************************)
(* Test framework *)
--
-tg: (923c5eb..) fixes/system-ocamlsexp (depends on: fixes/system-menhir)
+tg: (70da999..) 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 b5f2361..526a08f 100644
--- a/debian/patches/fixes/system-pycaml.diff
+++ b/debian/patches/fixes/system-pycaml.diff
@@ -6,13 +6,13 @@ Use Debian's pycaml instead of included one
Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
---
- Makefile | 11 +++++------
+ Makefile | 17 ++++++++---------
python/Makefile | 4 ++--
python/yes_pycocci.ml | 24 ++++++++++++++++++++----
- 3 files changed, 27 insertions(+), 12 deletions(-)
+ 3 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
-index 78923d7..05b140f 100644
+index 78923d7..bc61bcc 100644
--- a/Makefile
+++ b/Makefile
@@ -34,11 +34,11 @@ TARGET=spatch
@@ -24,14 +24,36 @@ index 78923d7..05b140f 100644
-PYLIB=dllpycaml_stubs.so
-# the following is essential for Coccinelle to compile under gentoo (weird)
-OPTLIBFLAGS=-cclib dllpycaml_stubs.so
-+PYCMA=-I $(shell ocamlfind query pycaml) pycaml.cma
-+PYDIR=
++PYCMA=pycaml.cma
++PYDIR=$(shell ocamlfind query pycaml)
+PYLIB=
+# the following is essential for Coccinelle to compile under gentoo (wierd)
+OPTLIBFLAGS=
else
PYCMA=
PYDIR=
+@@ -48,18 +48,18 @@ endif
+
+ 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 \
+- 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 extra python
+ INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
+ globals menhirlib $(PYDIR) ctl \
@@ -288,7 +288,6 @@ install-python:
$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
$(INSTALL_DATA) python/coccilib/coccigui/pygui.gladep \
diff --git a/debian/patches/series b/debian/patches/series
index c041c00..8df09eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
debian/documentation-paths.diff -p1
-fixes/system-menhir.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