[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.1.9.deb-1-18-g96329a6
Eugeniy Meshcheryakov
eugen at debian.org
Tue Jan 19 22:50:42 UTC 2010
The following commit has been merged in the master branch:
commit 4b504963ecb2d9b6d58fde10e2483350b0fb1eb4
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Tue Jan 19 22:37:45 2010 +0100
Do not use topgit and quilt. Convert package to source format 3.0 (quilt)
diff --git a/debian/changelog b/debian/changelog
index bde81ce..ad26a44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
coccinelle (0.2.0.deb-1) unstable; urgency=low
* New upstream release
+ * Do not use topgit and quilt. Convert package to source format 3.0 (quilt)
- -- Євгеній Мещеряков <eugen at debian.org> Tue, 19 Jan 2010 22:35:34 +0100
+ -- Євгеній Мещеряков <eugen at debian.org> Tue, 19 Jan 2010 22:37:03 +0100
coccinelle (0.1.10.deb-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index c2a3f8d..9f1686b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Євгеній Мещеряков <eugen at debian.org>
-Build-Depends: debhelper (>= 7), quilt, ocaml-nox (>= 3.11.0), pycaml (>= 0.82-10), python,
+Build-Depends: debhelper (>= 7), ocaml-nox (>= 3.11.0), pycaml (>= 0.82-10), python,
menhir (>= 20090204.dfsg), libmenhir-ocaml-dev (>= 20090204.dfsg), ocaml-findlib, dh-ocaml,
ocaml-best-compilers, python2.5-dev, python-support (>= 0.6), libsexplib-camlp4-dev
Standards-Version: 3.8.3
diff --git a/debian/patches/documentation-build.diff b/debian/patches/documentation-build.diff
new file mode 100644
index 0000000..0323961
--- /dev/null
+++ b/debian/patches/documentation-build.diff
@@ -0,0 +1,33 @@
+From: Eugeniy Meshcheryakov <eugen at debian.org>
+Subject: [PATCH] fixes/documentation-build
+
+Fix building of documentation (without manual directory)
+
+Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
+
+---
+ docs/Makefile | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/docs/Makefile b/docs/Makefile
+index 91d8e35..89eea99 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -3,12 +3,12 @@ SUBDIR=manual
+ .PHONY: all clean distclean
+
+ all:
+- make -C $(SUBDIR)
++# make -C $(SUBDIR)
+
+ clean:
+- make -C $(SUBDIR) clean
++# make -C $(SUBDIR) clean
+
+ distclean:
+- make -C $(SUBDIR) distclean
++# make -C $(SUBDIR) distclean
+
+
+--
+tg: (9b26161..) fixes/documentation-build (depends on: upstream)
diff --git a/debian/patches/documentation-paths.diff b/debian/patches/documentation-paths.diff
new file mode 100644
index 0000000..a2f3926
--- /dev/null
+++ b/debian/patches/documentation-paths.diff
@@ -0,0 +1,62 @@
+From: Eugeniy Meshcheryakov <eugen at debian.org>
+Subject: [PATCH] fix paths in documentation
+
+Upstream documentation assumes that coccinelle is installed under
+/usr/local. Patch changes this to /usr.
+
+Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
+
+---
+ docs/spatch.1 | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/docs/spatch.1 b/docs/spatch.1
+index 87e0ec8..2448f7c 100644
+--- a/docs/spatch.1
++++ b/docs/spatch.1
+@@ -61,10 +61,10 @@ the semantic patch file
+ process all files in directory recursively
+ .TP
+ .B -iso_file \fI<file>\fP
+-(default=/usr/local/share/coccinelle/standard.iso)
++(default=/usr/share/coccinelle/standard.iso)
+ .TP
+ .B -macro_file \fI<file>\fP
+-(default=/usr/local/share/coccinelle/standard.h)
++(default=/usr/share/coccinelle/standard.h)
+ .TP
+ .B -debug
+ print some information to help debug the matching process
+@@ -118,7 +118,7 @@ show summary of options.
+ Apply the semantic patch foo.cocci to the C file foo.c. The semantic patch
+ is applied modulo a set of isomorphisms contained in standard.iso
+ (standard.iso is by default located in
+-/usr/local/share/coccinelle/standard.iso). A patch showing the effect of
++/usr/share/coccinelle/standard.iso). A patch showing the effect of
+ the application, if any, will be generated on the standard output.
+
+ ./spatch -sp_file foo.cocci foo.c -o /tmp/newfoo.c
+@@ -136,18 +136,18 @@ shows selection of information about the application of
+ a semantic patch to a file or directory.
+
+ .SH FILES
+-.I /usr/local/share/coccinelle/standard.iso
++.I /usr/share/coccinelle/standard.iso
+ .RS
+ This file contains the default set of isomorphisms.
+ .RE
+-.I /usr/local/share/coccinelle/standard.h
++.I /usr/share/coccinelle/standard.h
+ .RS
+ This file contains the default set of macro hints.
+
+ .SH ENVIRONMENT
+ .IP COCCINELLE_HOME
+ The path to coccinelle share directory. Defaut is
+-.I /usr/local/share/coccinelle
++.I /usr/share/coccinelle
+
+ .SH REFERENCES
+ Y. Padioleau, J.L. Lawall, R.R Hansen, G. Muller
+--
+tg: (db116ff..) debian/documentation-paths (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5eda4a8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+documentation-paths.diff
+system-pycaml.diff
+system-menhir.diff
+system-ocamlsexp.diff
+documentation-build.diff
diff --git a/debian/patches/system-menhir.diff b/debian/patches/system-menhir.diff
new file mode 100644
index 0000000..ed0741b
--- /dev/null
+++ b/debian/patches/system-menhir.diff
@@ -0,0 +1,46 @@
+From: Eugeniy Meshcheryakov <eugen at debian.org>
+Subject: [PATCH] use system menhir for building
+
+Use Debian's menhir package for building
+
+Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
+
+---
+ Makefile | 4 ++--
+ parsing_cocci/Makefile | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e76f965..b2c2623 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 ctl parsing_cocci parsing_c \
++ globals ctl parsing_cocci parsing_c \
+ engine extra python
+ INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
+- globals menhirlib $(PYDIR) ctl \
++ globals $(PYDIR) ctl \
+ parsing_cocci parsing_c engine extra python
+
+ ##############################################################################
+diff --git a/parsing_cocci/Makefile b/parsing_cocci/Makefile
+index 9522b1e..b161f70 100644
+--- a/parsing_cocci/Makefile
++++ b/parsing_cocci/Makefile
+@@ -40,8 +40,8 @@ get_constants.ml get_constants2.ml adjacency.ml parse_cocci.ml
+ LIBS=../commons/commons.cma ../globals/globals.cma
+ SYSLIBS = str.cma unix.cma
+
+-#MENHIR_PATH=$(shell ocamlfind query menhirLib)
+-MENHIR_PATH=../menhirlib
++MENHIR_PATH=$(shell ocamlfind query menhirLib)
++#MENHIR_PATH=../menhirlib
+
+ INCLUDES = -I ../commons -I ../commons/ocamlextra -I ../globals \
+ -I $(MENHIR_PATH)
+--
+tg: (d20ea75..) fixes/system-menhir (depends on: fixes/system-pycaml)
diff --git a/debian/patches/system-ocamlsexp.diff b/debian/patches/system-ocamlsexp.diff
new file mode 100644
index 0000000..ff343d3
--- /dev/null
+++ b/debian/patches/system-ocamlsexp.diff
@@ -0,0 +1,141 @@
+From: Eugeniy Meshcheryakov <eugen at debian.org>
+Subject: [PATCH] fixes/system-ocamlsexp
+
+Use Debian's ocamlsexp
+
+Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
+
+---
+ Makefile | 12 +++++-------
+ commons/Makefile | 2 +-
+ commons/sexp_common.ml | 1 +
+ parsing_c/Makefile | 6 +++---
+ parsing_c/sexp_ast_c.ml | 1 +
+ testing.ml | 1 +
+ 6 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b2c2623..d4b24e1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -50,7 +50,7 @@ SEXPSYSCMA=bigarray.cma nums.cma
+
+ SYSLIBS=str.cma unix.cma $(PYCMA) $(SEXPSYSCMA)
+ LIBS=commons/commons.cma \
+- ocamlsexp/sexplib1.cma commons/commons_sexp.cma \
++ sexplib.cma commons/commons_sexp.cma \
+ globals/globals.cma \
+ ctl/ctl.cma \
+ parsing_cocci/cocci_parser.cma parsing_c/parsing_c.cma \
+@@ -58,10 +58,10 @@ LIBS=commons/commons.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 ctl parsing_cocci parsing_c \
+ engine extra python
+-INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
++INCLUDEDIRS=commons commons/ocamlextra \
+ globals $(PYDIR) ctl \
+ parsing_cocci parsing_c engine extra python
+
+@@ -93,8 +93,8 @@ OPTFLAGS=
+ # but is now defined above in this file
+ #OPTLIBFLAGS=-cclib dllpycaml_stubs.so
+
+-OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES)
+-OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES)
++OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
++OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
+ OCAMLLEX=ocamllex #-ml # -ml for debugging lexer, but slightly slower
+ OCAMLYACC=ocamlyacc -v
+ OCAMLDEP=ocamldep $(INCLUDES)
+@@ -133,13 +133,11 @@ top: $(EXEC).top
+
+ subdirs:
+ $(MAKE) -C commons OCAMLCFLAGS="$(OCAMLCFLAGS)"
+- $(MAKE) -C ocamlsexp OCAMLCFLAGS="$(OCAMLCFLAGS)"
+ $(MAKE) -C commons sexp OCAMLCFLAGS="$(OCAMLCFLAGS)"
+ +for D in $(MAKESUBDIRS); do $(MAKE) $$D || exit 1 ; done
+
+ subdirs.opt:
+ $(MAKE) -C commons all.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
+- $(MAKE) -C ocamlsexp all.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
+ $(MAKE) -C commons sexp.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
+ +for D in $(MAKESUBDIRS); do $(MAKE) $$D.opt || exit 1 ; done
+
+diff --git a/commons/Makefile b/commons/Makefile
+index 081bb1a..4813a6a 100644
+--- a/commons/Makefile
++++ b/commons/Makefile
+@@ -72,7 +72,7 @@ REGEXPINCLUDES=-I ../ocamlpcre/lib -I ../../ocamlpcre/lib
+
+ #sexplib
+ MYSEXPSRC=sexp_common.ml
+-SEXPINCLUDES=-I ../ocamlsexp -I ../ocamltarzan/lib-sexp -I ../../ocamltarzan/lib-sexp
++SEXPINCLUDES=-I `ocamlfind query sexplib` -I ../ocamltarzan/lib-sexp -I ../../ocamltarzan/lib-sexp
+ #binprot
+ MYBINSRC=bin_common.ml
+ BININCLUDES=-I ../ocamltarzan/lib-binprot -I ../../ocamltarzan/lib-binprot
+diff --git a/commons/sexp_common.ml b/commons/sexp_common.ml
+index 208d760..806c40e 100644
+--- a/commons/sexp_common.ml
++++ b/commons/sexp_common.ml
+@@ -1,6 +1,7 @@
+ (* automatically generated by ocamltarzan *)
+
+ open Common
++open Sexplib
+
+ let either_of_sexp__ =
+ let _loc = "Xxx.either"
+diff --git a/parsing_c/Makefile b/parsing_c/Makefile
+index 04a03c3..3274ca7 100644
+--- a/parsing_c/Makefile
++++ b/parsing_c/Makefile
+@@ -10,7 +10,7 @@ TARGET=parsing_c
+
+ ifeq ($(FEATURE_TARZAN), 1)
+ TARZANSRC=sexp_ast_c.ml
+-TARZANINCLUDE=-I ../ocamlsexp
++#TARZANINCLUDE=-I ../ocamlsexp
+ endif
+
+
+@@ -62,8 +62,8 @@ SYSLIBS= str.cma unix.cma num.cma
+ #for profiling: -p -inline 0 with OCAMLOPT
+ OCAMLCFLAGS ?= -g -dtypes
+
+-OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES)
+-OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES)
++OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
++OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
+ OCAMLLEX=ocamllex$(OPTBIN) #-ml
+ OCAMLYACC=ocamlyacc -v
+ OCAMLDEP=ocamldep$(OPTBIN) $(INCLUDES)
+diff --git a/parsing_c/sexp_ast_c.ml b/parsing_c/sexp_ast_c.ml
+index 4c6f2aa..a7a1425 100644
+--- a/parsing_c/sexp_ast_c.ml
++++ b/parsing_c/sexp_ast_c.ml
+@@ -1,5 +1,6 @@
+ (* generated by ocamltarzan with: camlp4o -o /tmp/yyy.ml -I pa/ pa_type_conv.cmo pa_sexp_conv.cmo pr_o.cmo /tmp/xxx.ml *)
+ open Ast_c
++open Sexplib
+
+ (*
+ let sexp_of_program x =
+diff --git a/testing.ml b/testing.ml
+index 6ca4be7..9ef923f 100644
+--- a/testing.ml
++++ b/testing.ml
+@@ -21,6 +21,7 @@
+
+
+ open Common
++open Sexplib
+
+ (*****************************************************************************)
+ (* Test framework *)
+--
+tg: (526c105..) fixes/system-ocamlsexp (depends on: fixes/system-menhir)
diff --git a/debian/patches/system-pycaml.diff b/debian/patches/system-pycaml.diff
new file mode 100644
index 0000000..e3bc377
--- /dev/null
+++ b/debian/patches/system-pycaml.diff
@@ -0,0 +1,101 @@
+From: Eugeniy Meshcheryakov <eugen at debian.org>
+Subject: [PATCH] use system pycaml for building
+
+Use Debian's pycaml instead of included one
+
+Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
+
+---
+ Makefile | 17 ++++++++---------
+ python/Makefile | 4 ++--
+ python/yes_pycocci.ml | 2 +-
+ 3 files changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7d216f6..e76f965 100644
+--- a/Makefile
++++ b/Makefile
+@@ -34,11 +34,11 @@ TARGET=spatch
+ SRC=flag_cocci.ml cocci.ml testing.ml test.ml main.ml
+
+ ifeq ($(FEATURE_PYTHON),1)
+-PYCMA=pycaml/pycaml.cma
+-PYDIR=pycaml
+-PYLIB=dllpycaml_stubs.so
+-# the following is essential for Coccinelle to compile under gentoo (weird)
+-OPTLIBFLAGS=-cclib dllpycaml_stubs.so
++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 \
+@@ -289,7 +289,6 @@ install-python:
+ $(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
+ $(INSTALL_DATA) python/coccilib/coccigui/pygui.gladep \
+ $(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
+- $(INSTALL_LIB) dllpycaml_stubs.so $(DESTDIR)$(LIBDIR)
+
+ install: install-common
+ @if test -x spatch -a ! -x spatch.opt ; then \
+diff --git a/python/Makefile b/python/Makefile
+index 16a9407..0901819 100644
+--- a/python/Makefile
++++ b/python/Makefile
+@@ -30,7 +30,7 @@ TARGET=coccipython
+
+ SOURCES= pycocci_aux.ml pycocci.ml
+
+-INCLUDEDIRS = ../commons ../commons/ocamlextra ../globals ../pycaml \
++INCLUDEDIRS = ../commons ../commons/ocamlextra ../globals \
+ ../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 8de88e0..6662eb7 100644
+--- a/python/yes_pycocci.ml
++++ b/python/yes_pycocci.ml
+@@ -103,7 +103,7 @@ let pycocci_get_class_type fqn =
+
+ let pycocci_instantiate_class fqn args =
+ let class_type = pycocci_get_class_type fqn in
+- let obj = pyobject_callobject(class_type, args) in
++ let obj = pyeval_callobject(class_type, args) in
+ check_return_value obj;
+ obj
+
+--
+tg: (9b26161..) fixes/system-pycaml (depends on: upstream)
diff --git a/debian/rules b/debian/rules
index 41058aa..2b8ee66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,6 @@ TG_BRANCHES = debian/documentation-paths \
fixes/system-ocamlsexp \
fixes/documentation-build
-include /usr/share/quilt/quilt.make
--include /usr/share/topgit/tg2quilt.mk
-include /usr/share/ocaml/ocamlvars.mk
-
COCCI_FLAGS = BYTECODE_STATIC="" MANDIR=/usr/share/man
VIM_ADIR = $(CURDIR)/debian/coccinelle/usr/share/vim/addons
@@ -30,14 +26,8 @@ CONFIG_FLAGS = $(COMMON_CONFIG) --no-opt
MAKE_TGT = all
endif
-my-very-own-patch-stamp:
- # work around broken tg2quilt (#522906)
- [ -f $(QUILT_STAMPFN) ] || debian/rules $(QUILT_STAMPFN)
- touch my-very-own-patch-stamp
-
build: build-stamp
-#build-stamp: $(QUILT_STAMPFN)
-build-stamp: my-very-own-patch-stamp
+build-stamp:
dh build --before dh_auto_configure
./configure $(CONFIG_FLAGS)
$(MAKE) $(COCCI_FLAGS) depend
@@ -45,14 +35,8 @@ build-stamp: my-very-own-patch-stamp
dh build --after dh_auto_test
touch build-stamp
-# this is needed because patches modify clean target
-unpatch: patched-clean
-patched-clean: patch
- $(MAKE) distclean
-
clean: unpatch
- dh clean --before dh_auto_clean
- dh clean --after dh_auto_clean
+ dh clean
install: install-stamp
install-stamp: build-stamp
@@ -90,7 +74,4 @@ binary-indep: install
binary: binary-indep binary-arch
-tag-patches:
- sh debian/tag-patches.sh $(TG_BRANCHES)
-
-.PHONY: build clean binary-indep binary-arch binary install tag-patches
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Debian packaging for coccinelle
More information about the Pkg-ocaml-maint-commits
mailing list