[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.2.deb-2-19-gf3e1171

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit 44c2998a0ef773ef27f78e49693c950d7797f46b
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Sat Jul 24 22:29:10 2010 +0200

    New patches:
    
    * New patches:
      - syslibs-depend.diff - fix depend targets when system libraries are used

diff --git a/debian/changelog b/debian/changelog
index 7d20414..a690a70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,12 @@ coccinelle (0.2.3.deb-1) unstable; urgency=low
     - system-{pycaml,menhir,ocamlsexp}.diff - upstream build system can handle
       this
     - documentation-paths.diff - the manpage is generated using correct paths
+  * New patches:
+    - syslibs-depend.diff - fix depend targets when system libraries are used
   * Override clean directories in debian/rules: upstream makefile tries to
     clean directories removed in Debian package
 
- -- Євгеній Мещеряков <eugen at debian.org>  Sat, 24 Jul 2010 22:18:07 +0200
+ -- Євгеній Мещеряков <eugen at debian.org>  Sat, 24 Jul 2010 22:28:25 +0200
 
 coccinelle (0.2.2.deb-2) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 2a5cb6d..b6a2edf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 documentation-build.diff
+syslibs-depend.diff
diff --git a/debian/patches/syslibs-depend.diff b/debian/patches/syslibs-depend.diff
new file mode 100644
index 0000000..d678224
--- /dev/null
+++ b/debian/patches/syslibs-depend.diff
@@ -0,0 +1,40 @@
+Index: coccinelle/python/Makefile
+===================================================================
+--- coccinelle.orig/python/Makefile	2010-07-24 22:26:58.929645502 +0200
++++ coccinelle/python/Makefile	2010-07-24 22:31:31.736183497 +0200
+@@ -32,12 +32,14 @@
+ 
+ SOURCES= pycocci_aux.ml pycocci.ml
+ 
++INCLUDEDIRS_LOCAL = ../commons ../commons/ocamlextra ../globals \
++		    ../parsing_c ../parsing_cocci
++
+ ifeq ("$(PYCAMLDIR)", "pycaml")
+-INCLUDEDIRS = ../commons ../commons/ocamlextra ../globals ../$(PYCAMLDIR) \
+-	      ../parsing_c ../parsing_cocci
++INCLUDEDIRS_LOCAL += ../$(PYCAMLDIR)
++INCLUDEDIRS = $(INCLUDEDIRS_LOCAL)
+ else
+-INCLUDEDIRS = ../commons ../commons/ocamlextra ../globals $(PYCAMLDIR) \
+-	      ../parsing_c ../parsing_cocci
++INCLUDEDIRS = $(INCLUDEDIRS_LOCAL) $(PYCAMLDIR)
+ endif
+ 
+ SYSLIBS = str.cma unix.cma pycaml.cma
+@@ -48,6 +50,7 @@
+ ##############################################################################
+ 
+ INCLUDES=$(INCLUDEDIRS:%=-I %) $(INCLUDESEXTRA)
++INCLUDES_DEPEND=$(INCLUDEDIRS_LOCAL:%=-I %) $(INCLUDESEXTRA)
+ 
+ ##############################################################################
+ # Generic ocaml variables
+@@ -57,7 +60,7 @@
+ OCAMLCFLAGS ?= -g -dtypes
+ OCAMLC =ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES)
+ OCAMLOPT = ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES)
+-OCAMLDEP = ocamldep$(OPTBIN) $(INCLUDES)
++OCAMLDEP = ocamldep$(OPTBIN) $(INCLUDES_DEPEND)
+ 
+ 
+ ##############################################################################

-- 
Debian packaging for coccinelle