[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.3.deb-1-7-g80f9850

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit 5f6b47beac84a7a5c6ed369649180cea6b5d36c0
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Sun Nov 21 20:59:35 2010 +0100

    Removed patches:
    
    * Removed patches:
      - syslibs-depend.diff - applied upstream

diff --git a/debian/changelog b/debian/changelog
index 56af15a..7a75664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 coccinelle (0.2.4.deb-1) experimental; urgency=low
 
   * New upstream release
+  * Removed patches:
+    - syslibs-depend.diff - applied upstream 
 
- -- Євгеній Мещеряков <eugen at debian.org>  Sun, 21 Nov 2010 20:51:32 +0100
+ -- Євгеній Мещеряков <eugen at debian.org>  Sun, 21 Nov 2010 20:58:56 +0100
 
 coccinelle (0.2.3.deb-1) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index 56051ea..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-syslibs-depend.diff
diff --git a/debian/patches/syslibs-depend.diff b/debian/patches/syslibs-depend.diff
deleted file mode 100644
index d678224..0000000
--- a/debian/patches/syslibs-depend.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-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