[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, patched, updated. patched/0.1.8.deb-2-1-gc01aa62
Eugeniy Meshcheryakov
eugen at debian.org
Thu Jun 11 23:16:13 UTC 2009
The following commit has been merged in the patched branch:
commit c01aa62e4314ee7739dc963cad3081cf4a4433d8
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Fri Jun 12 01:15:13 2009 +0200
Patches for version 0.1.8.deb-3
diff --git a/debian/patches/fixes/system-menhir.diff b/debian/patches/fixes/system-menhir.diff
index 54e43cf..24ab372 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 aeaf9f3..f57fe76 100644
+index 05b140f..49a2a35 100644
--- a/Makefile
+++ b/Makefile
@@ -59,10 +59,10 @@ LIBS=commons/commons.cma \
@@ -43,4 +43,4 @@ index 51a86b4..532c0d4 100644
INCLUDES = -I ../commons -I ../commons/ocamlextra -I ../globals \
-I $(MENHIR_PATH)
--
-tg: (25d7b7a..) fixes/system-menhir (depends on: fixes/system-pycaml)
+tg: (03b520a..) 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 b628056..8dfdcb7 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 f57fe76..cd974ce 100644
+index 49a2a35..d0f28a1 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ SEXPSYSCMA=bigarray.cma nums.cma
@@ -101,4 +101,4 @@ index b488d72..ee89772 100644
(*****************************************************************************)
(* Test framework *)
--
-tg: (35e77c2..) fixes/system-ocamlsexp (depends on: fixes/system-menhir)
+tg: (923c5eb..) 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 dc6748c..b5f2361 100644
--- a/debian/patches/fixes/system-pycaml.diff
+++ b/debian/patches/fixes/system-pycaml.diff
@@ -7,12 +7,12 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
---
Makefile | 11 +++++------
- python/Makefile | 2 +-
+ python/Makefile | 4 ++--
python/yes_pycocci.ml | 24 ++++++++++++++++++++----
- 3 files changed, 26 insertions(+), 11 deletions(-)
+ 3 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
-index 78923d7..aeaf9f3 100644
+index 78923d7..05b140f 100644
--- a/Makefile
+++ b/Makefile
@@ -34,11 +34,11 @@ TARGET=spatch
@@ -24,7 +24,7 @@ index 78923d7..aeaf9f3 100644
-PYLIB=dllpycaml_stubs.so
-# the following is essential for Coccinelle to compile under gentoo (weird)
-OPTLIBFLAGS=-cclib dllpycaml_stubs.so
-+PYCMA=pycaml.cma
++PYCMA=-I $(shell ocamlfind query pycaml) pycaml.cma
+PYDIR=
+PYLIB=
+# the following is essential for Coccinelle to compile under gentoo (wierd)
@@ -41,7 +41,7 @@ index 78923d7..aeaf9f3 100644
install: install-common
@if test -x spatch -a ! -x spatch.opt ; then \
diff --git a/python/Makefile b/python/Makefile
-index 16a9407..33e2642 100644
+index 16a9407..0901819 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -30,7 +30,7 @@ TARGET=coccipython
@@ -53,6 +53,15 @@ index 16a9407..33e2642 100644
../parsing_c ../parsing_cocci
SYSLIBS = str.cma unix.cma
+@@ -45,7 +45,7 @@ LIBS=../commons/commons.cma ../globals/globals.cma
+ # Generic variables
+ ##############################################################################
+
+-INCLUDES=$(INCLUDEDIRS:%=-I %) $(INCLUDESEXTRA)
++INCLUDES=$(INCLUDEDIRS:%=-I %) $(INCLUDESEXTRA) -I $(shell ocamlfind query pycaml)
+
+ ##############################################################################
+ # Generic ocaml variables
diff --git a/python/yes_pycocci.ml b/python/yes_pycocci.ml
index 2ef2807..7949d91 100644
--- a/python/yes_pycocci.ml
--
Debian packaging for coccinelle
More information about the Pkg-ocaml-maint-commits
mailing list