[Pkg-ocaml-maint-commits] [SCM] pycaml packaging branch, master, updated. debian/0.82-9-8-ge16b4b5
Stephane Glondu
steph at glondu.net
Fri Jun 5 20:36:48 UTC 2009
The following commit has been merged in the master branch:
commit b3230650062acf5e1f9d38d485371b1a7763f30c
Author: Stephane Glondu <steph at glondu.net>
Date: Fri Jun 5 17:12:43 2009 +0200
Split and simplify old wrap_pycall.dpatch
Make explicit the two natures of changes that this patch introduce,
and remove changes to the Makefile (which, IMHO, do not belong to the
Debian packaging).
diff --git a/debian/patches/0001-Wrap-Py_-calls.patch b/debian/patches/0001-Wrap-Py_-calls.patch
index f175e00..3eb0075 100644
--- a/debian/patches/0001-Wrap-Py_-calls.patch
+++ b/debian/patches/0001-Wrap-Py_-calls.patch
@@ -1,87 +1,17 @@
-From: Sylvain Le Gall <gildor at debian.org>
-Date: Fri, 5 Jun 2009 17:01:00 +0200
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 5 Jun 2009 17:11:04 +0200
Subject: [PATCH] Wrap Py_* calls
Patch provided by Christopher L. Conway (Closes: #477010).
---
- Makefile.in | 14 ++++++++------
- pycaml.ml | 3 ++-
- pycaml_ml.c | 51 +++++++++++++++++++++++++++++++++++++--------------
- 3 files changed, 47 insertions(+), 21 deletions(-)
+ pycaml_ml.c | 43 ++++++++++++++++++++++++++++++++-----------
+ 1 files changed, 32 insertions(+), 11 deletions(-)
-diff --git a/Makefile.in b/Makefile.in
-index 5b74075..be63ab3 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -5,6 +5,8 @@
- PY_PREFIX=@PY_PREFIX@
- PY_VERSION=@PY_VERSION@
- SYSLIBS=@PY_LIBS@
-+OCAMLC=ocamlc
-+OCAMLMKTOP=ocamlmktop
-
- #
- # The rest is automatic
-@@ -18,23 +20,23 @@ LIBS= pycaml_ml.o \
- all: pycamltop pycamltest ocamlobj
-
- pycamltop: pycaml_ml.o pycaml.cmo
-- ocamlmktop -thread -custom -o $@ $(LIBS)
-+ $(OCAMLMKTOP) -thread -custom -o $@ $(LIBS)
-
- pycaml_ml.o: pycaml_ml.c
-- ocamlc -thread -ccopt -c -ccopt -g \
-+ $(OCAMLC) -thread -ccopt -c -ccopt -g \
- -ccopt -I$(PY_PREFIX)/include/python$(PY_VERSION) $<
-
- pycaml.cmo: pycaml.ml
-- ocamlc -thread -c $<
-+ $(OCAMLC) -thread -c $<
-
- pycamltest: pycamltest.ml pycaml.cmo pycaml_ml.o
-- ocamlc -custom -thread -ccopt -g $(LIBS) pycamltest.ml -o $@
-+ $(OCAMLC) -custom -thread -ccopt -g $(LIBS) pycamltest.ml -o $@
-
- ocamlobj: ocamlobj.ml pycaml.cmo pycaml_ml.o
-- ocamlc -custom -thread -ccopt -g $(LIBS) ocamlobj.ml -o $@
-+ $(OCAMLC) -custom -thread -ccopt -g $(LIBS) ocamlobj.ml -o $@
-
- clean:
- rm -rf *.o *.cmi *.cmo pycamltop pycamltest ocamlobj
-
- distclean: clean
-- rm -rf config.cache autom4te.cache config.status Makefile
-\ No newline at end of file
-+ rm -rf config.cache autom4te.cache config.status Makefile
-diff --git a/pycaml.ml b/pycaml.ml
-index cd273ef..6bfe17c 100644
---- a/pycaml.ml
-+++ b/pycaml.ml
-@@ -318,7 +318,8 @@ let pyslice_new = fmt42call (pnf ())
- (* 43 *)
- let pyslice_getindices = fmt43call (pnf ())
- (* 44 *)
--let pyrange_new = fmt44call (pnf ())
-+(* PyRange_New has been removed from the API *)
-+(* let pyrange_new = fmt44call (pnf ()) *)
-
- (* Error handling definitions *)
-
diff --git a/pycaml_ml.c b/pycaml_ml.c
-index 0edb262..0f69368 100644
+index 0edb262..ce6790d 100644
--- a/pycaml_ml.c
+++ b/pycaml_ml.c
-@@ -666,7 +666,8 @@ DL_IMPORT(PyObject *) PySlice_New(PyObject* start, PyObject* stop, PyObject* ste
- /* 43 */
- DL_IMPORT(int) PySlice_GetIndices(PySliceObject *r, int length, int *start, int *stop, int *step);
- /* 44 */
--DL_IMPORT(PyObject *) PyRange_New(long, long, long, int);
-+/* PyRange_New has been removed from the API */
-+/* DL_IMPORT(PyObject *) PyRange_New(long, long, long, int); */
-
- /* Error handling definitions */
-
-@@ -897,6 +898,27 @@ value pyunwrapvalue( value cb ) {
+@@ -897,6 +897,27 @@ value pyunwrapvalue( value cb ) {
CAMLreturn(*v);
}
@@ -93,23 +23,23 @@ index 0edb262..0f69368 100644
+int wrap_PyRun_InteractiveOne(FILE *f, const char * p) { return PyRun_InteractiveOne(f,p); }
+int wrap_PyRun_InteractiveLoop(FILE *f, const char * p) { return PyRun_InteractiveLoop(f,p); }
+PyObject * wrap_PyRun_String(const char *str, int s, PyObject * g, PyObject * l) {
-+ return PyRun_String(str,s,g,l);
++ return PyRun_String(str,s,g,l);
+}
+PyObject * wrap_PyRun_File(FILE *f, const char *p, int s, PyObject * g, PyObject * l) {
-+ return PyRun_File(f,p,s,g,l);
++ return PyRun_File(f,p,s,g,l);
+}
+PyObject *wrap_PyRun_FileEx(FILE *f, const char *p, int s, PyObject * g, PyObject * l,int c) {
-+ return PyRun_FileEx(f,p,s,g,l,c);
++ return PyRun_FileEx(f,p,s,g,l,c);
+}
+PyObject * wrap_Py_CompileString(const char *str, const char *p, int s) {
-+ return Py_CompileString(str,p,s);
++ return Py_CompileString(str,p,s);
+}
+
+
/* Create the function table */
typedef struct _python_func_table {
-@@ -919,16 +941,16 @@ python_func_table the_python_func_table[] = {
+@@ -919,16 +940,16 @@ python_func_table the_python_func_table[] = {
/* 4 */
{ (void *)Py_IsInitialized, 4, "Py_IsInitialized" },
/* 5 */
@@ -133,7 +63,7 @@ index 0edb262..0f69368 100644
/* 8 */
{ (void *)Py_GetProgramName, 8, "Py_GetProgramName" },
{ (void *)Py_GetPythonHome, 8, "Py_GetPythonHome" },
-@@ -942,13 +964,13 @@ python_func_table the_python_func_table[] = {
+@@ -942,13 +963,13 @@ python_func_table the_python_func_table[] = {
{ (void *)Py_GetCompiler, 8, "Py_GetCompiler" },
{ (void *)Py_GetBuildInfo, 8, "Py_GetBuildInfo" },
/* 9 */
@@ -151,16 +81,4 @@ index 0edb262..0f69368 100644
/* Object */
/* 13 */
-@@ -1062,8 +1084,9 @@ python_func_table the_python_func_table[] = {
- { (void *)PySlice_New, 42, "PySlice_New" },
- /* 43 */
- { (void *)PySlice_GetIndices, 43, "PySlice_GetIndices" },
--/* 44 */
-- { (void *)PyRange_New, 44, "PyRange_New" },
-+/* 44 */
-+ /* PyRange_New has been removed from the API */
-+ /* { (void *)PyRange_New, 44, "PyRange_New" }, */
-
- /* Error handling definitions */
-
--
diff --git a/debian/patches/0002-Removal-of-PyRange_New.patch b/debian/patches/0002-Removal-of-PyRange_New.patch
new file mode 100644
index 0000000..92f6e72
--- /dev/null
+++ b/debian/patches/0002-Removal-of-PyRange_New.patch
@@ -0,0 +1,48 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 5 Jun 2009 17:11:47 +0200
+Subject: [PATCH] Removal of PyRange_New
+
+---
+ pycaml.ml | 3 ++-
+ pycaml_ml.c | 6 ++++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/pycaml.ml b/pycaml.ml
+index cd273ef..6bfe17c 100644
+--- a/pycaml.ml
++++ b/pycaml.ml
+@@ -318,7 +318,8 @@ let pyslice_new = fmt42call (pnf ())
+ (* 43 *)
+ let pyslice_getindices = fmt43call (pnf ())
+ (* 44 *)
+-let pyrange_new = fmt44call (pnf ())
++(* PyRange_New has been removed from the API *)
++(* let pyrange_new = fmt44call (pnf ()) *)
+
+ (* Error handling definitions *)
+
+diff --git a/pycaml_ml.c b/pycaml_ml.c
+index ce6790d..5622274 100644
+--- a/pycaml_ml.c
++++ b/pycaml_ml.c
+@@ -666,7 +666,8 @@ DL_IMPORT(PyObject *) PySlice_New(PyObject* start, PyObject* stop, PyObject* ste
+ /* 43 */
+ DL_IMPORT(int) PySlice_GetIndices(PySliceObject *r, int length, int *start, int *stop, int *step);
+ /* 44 */
+-DL_IMPORT(PyObject *) PyRange_New(long, long, long, int);
++/* PyRange_New has been removed from the API */
++/* DL_IMPORT(PyObject *) PyRange_New(long, long, long, int); */
+
+ /* Error handling definitions */
+
+@@ -1084,7 +1085,8 @@ python_func_table the_python_func_table[] = {
+ /* 43 */
+ { (void *)PySlice_GetIndices, 43, "PySlice_GetIndices" },
+ /* 44 */
+- { (void *)PyRange_New, 44, "PyRange_New" },
++ /* PyRange_New has been removed from the API */
++ /* { (void *)PyRange_New, 44, "PyRange_New" }, */
+
+ /* Error handling definitions */
+
+--
diff --git a/debian/patches/series b/debian/patches/series
index 2616c15..59bd9ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Wrap-Py_-calls.patch
+0002-Removal-of-PyRange_New.patch
--
pycaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list