[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.2.deb-1-3-gb5faaf4

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit 1515ee9aef4d9f747fb0c139bc75fbc9b1da8ce9
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Mon Jun 21 14:44:29 2010 +0200

    Updated patches:
    
    * Updated patches:
      - system-pycaml.diff - do not add pycaml to ocamldep include path,
        otherwise it tries to compile pycaml.ml

diff --git a/debian/changelog b/debian/changelog
index d2ddbef..ecbdf29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ coccinelle (0.2.2.deb-2) unstable; urgency=medium
   * Build depend on libpycaml-ocaml-dev and remove build dependency on
     python2.5-dev (closes: #567942)
   * Urgency medium because of fix for an RC bug
+  * Updated patches:
+    - system-pycaml.diff - do not add pycaml to ocamldep include path,
+      otherwise it tries to compile pycaml.ml
 
- -- Євгеній Мещеряков <eugen at debian.org>  Mon, 21 Jun 2010 14:23:24 +0200
+ -- Євгеній Мещеряков <eugen at debian.org>  Mon, 21 Jun 2010 14:43:22 +0200
 
 coccinelle (0.2.2.deb-1) unstable; urgency=low
 
diff --git a/debian/patches/system-pycaml.diff b/debian/patches/system-pycaml.diff
index b4eba4c..06b07d8 100644
--- a/debian/patches/system-pycaml.diff
+++ b/debian/patches/system-pycaml.diff
@@ -13,9 +13,9 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
 
 Index: coccinelle/Makefile
 ===================================================================
---- coccinelle.orig/Makefile	2010-01-31 16:16:35.418336120 +0100
-+++ coccinelle/Makefile	2010-01-31 16:20:17.242479853 +0100
-@@ -36,11 +36,11 @@
+--- 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)
@@ -32,7 +32,7 @@ Index: coccinelle/Makefile
  else
  PYCMA=
  PYDIR=
-@@ -50,18 +50,18 @@
+@@ -54,18 +54,18 @@
  
  SEXPSYSCMA=bigarray.cma nums.cma
  
@@ -54,7 +54,7 @@ Index: coccinelle/Makefile
   engine popl09 extra python
  INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
   globals menhirlib $(PYDIR) ctl \
-@@ -289,7 +289,6 @@
+@@ -294,7 +294,6 @@
  		$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
  	$(INSTALL_DATA) python/coccilib/coccigui/pygui.gladep \
  		$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
@@ -64,8 +64,8 @@ Index: coccinelle/Makefile
  	@if test -x spatch -a ! -x spatch.opt ; then \
 Index: coccinelle/python/Makefile
 ===================================================================
---- coccinelle.orig/python/Makefile	2010-01-31 16:16:35.481669549 +0100
-+++ coccinelle/python/Makefile	2010-01-31 16:20:17.245845592 +0100
+--- 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
@@ -75,19 +75,29 @@ Index: coccinelle/python/Makefile
  	      ../parsing_c ../parsing_cocci
  
  SYSLIBS = str.cma unix.cma
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,8 @@
  # Generic variables
  ##############################################################################
  
 -INCLUDES=$(INCLUDEDIRS:%=-I %) $(INCLUDESEXTRA)
-+INCLUDES=$(INCLUDEDIRS:%=-I %) $(INCLUDESEXTRA) -I $(shell ocamlfind query pycaml)
++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-01-31 16:16:35.448340551 +0100
-+++ coccinelle/python/yes_pycocci.ml	2010-01-31 16:20:17.245845592 +0100
+--- 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 =

-- 
Debian packaging for coccinelle