[Pkg-ocaml-maint-commits] r5681 - in /trunk/packages/pycaml/trunk/debian: Makefile changelog control patches/ patches/00list patches/wrap_pycall.dpatch pycaml.doc-base rules
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Fri May 23 12:35:50 UTC 2008
Author: gildor
Date: Fri May 23 12:35:50 2008
New Revision: 5681
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5681
Log:
* Use dpatch
* Apply provided patches to wrap Py_* function call
* Update to python 2.5
* Rebuild for ocaml 3.10.2
* Add myself to uploaders
Added:
trunk/packages/pycaml/trunk/debian/patches/
trunk/packages/pycaml/trunk/debian/patches/00list
trunk/packages/pycaml/trunk/debian/patches/wrap_pycall.dpatch (with props)
Modified:
trunk/packages/pycaml/trunk/debian/Makefile
trunk/packages/pycaml/trunk/debian/changelog
trunk/packages/pycaml/trunk/debian/control
trunk/packages/pycaml/trunk/debian/pycaml.doc-base
trunk/packages/pycaml/trunk/debian/rules
Modified: trunk/packages/pycaml/trunk/debian/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pycaml/trunk/debian/Makefile?rev=5681&op=diff
==============================================================================
--- trunk/packages/pycaml/trunk/debian/Makefile (original)
+++ trunk/packages/pycaml/trunk/debian/Makefile Fri May 23 12:35:50 2008
@@ -1,7 +1,7 @@
OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
PY_PREFIX = $(shell python getprefix.py)
PY_VERSION = $(shell python getversion.py)
-CLIBS = python2.4 pthread dl util m c
+CLIBS = python2.5 pthread dl util m c
SOURCES = pycaml.ml pycaml_ml.c
RESULT = pycaml
Modified: trunk/packages/pycaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pycaml/trunk/debian/changelog?rev=5681&op=diff
==============================================================================
--- trunk/packages/pycaml/trunk/debian/changelog (original)
+++ trunk/packages/pycaml/trunk/debian/changelog Fri May 23 12:35:50 2008
@@ -1,8 +1,17 @@
-pycaml (0.82-8) UNRELEASED; urgency=low
+pycaml (0.82-8) unstable; urgency=low
+ [ Stefano Zacchiroli ]
* fix vcs-svn field to point just above the debian/ dir
- -- Stefano Zacchiroli <zack at debian.org> Mon, 31 Dec 2007 16:50:17 +0100
+ [ Sylvain Le Gall ]
+ * Use dpatch
+ * Apply provided patches to wrap Py_* function call, thanks to
+ Christopher L. Conway (Closes: #477010)
+ * Update to python 2.5
+ * Rebuild for ocaml 3.10.2
+ * Add myself to uploaders
+
+ -- Sylvain Le Gall <gildor at debian.org> Fri, 23 May 2008 14:31:13 +0200
pycaml (0.82-7) unstable; urgency=low
Modified: trunk/packages/pycaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pycaml/trunk/debian/control?rev=5681&op=diff
==============================================================================
--- trunk/packages/pycaml/trunk/debian/control (original)
+++ trunk/packages/pycaml/trunk/debian/control Fri May 23 12:35:50 2008
@@ -2,8 +2,8 @@
Section: libdevel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python-support (>= 0.3), ocaml-nox (>= 3.10), python-dev (>= 2.3), ocamlmakefile
+Uploaders: Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>
+Build-Depends: debhelper (>= 5.0.37.2), python-support (>= 0.3), ocaml-nox (>= 3.10), python-dev (>= 2.3), ocamlmakefile, dpatch
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/pycaml/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pycaml/trunk/
Added: trunk/packages/pycaml/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pycaml/trunk/debian/patches/00list?rev=5681&op=file
==============================================================================
--- trunk/packages/pycaml/trunk/debian/patches/00list (added)
+++ trunk/packages/pycaml/trunk/debian/patches/00list Fri May 23 12:35:50 2008
@@ -1,0 +1,1 @@
+wrap_pycall
Added: trunk/packages/pycaml/trunk/debian/patches/wrap_pycall.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pycaml/trunk/debian/patches/wrap_pycall.dpatch?rev=5681&op=file
==============================================================================
--- trunk/packages/pycaml/trunk/debian/patches/wrap_pycall.dpatch (added)
+++ trunk/packages/pycaml/trunk/debian/patches/wrap_pycall.dpatch Fri May 23 12:35:50 2008
@@ -1,0 +1,158 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wrap_pycall.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/Makefile.in trunk/Makefile.in
+--- trunk~/Makefile.in 2003-09-17 07:30:15.000000000 +0200
++++ trunk/Makefile.in 2008-05-23 14:27:28.057334979 +0200
+@@ -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 @@
+ 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 -urNad trunk~/pycaml.ml trunk/pycaml.ml
+--- trunk~/pycaml.ml 2002-05-29 06:39:11.000000000 +0200
++++ trunk/pycaml.ml 2008-05-23 14:27:28.057334979 +0200
+@@ -318,7 +318,8 @@
+ (* 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 -urNad trunk~/pycaml_ml.c trunk/pycaml_ml.c
+--- trunk~/pycaml_ml.c 2004-12-02 17:17:07.000000000 +0100
++++ trunk/pycaml_ml.c 2008-05-23 14:27:28.061334863 +0200
+@@ -666,7 +666,8 @@
+ /* 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 @@
+ CAMLreturn(*v);
+ }
+
++int wrap_PyRun_SimpleString(const char *s) { return PyRun_SimpleString(s); }
++int wrap_PyRun_AnyFile(FILE *f, const char * p) { return PyRun_AnyFile(f,p); }
++int wrap_PyRun_AnyFileEx(FILE *f, const char * p, int c) { return PyRun_AnyFileEx(f,p,c); }
++int wrap_PyRun_SimpleFile(FILE *f, const char * p) { return PyRun_SimpleFile(f,p); }
++int wrap_PyRun_SimpleFileEx(FILE *f, const char * p, int c) { return PyRun_SimpleFileEx(f,p,c); }
++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);
++}
++PyObject * wrap_PyRun_File(FILE *f, const char *p, int s, PyObject * g, PyObject * 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);
++}
++PyObject * wrap_Py_CompileString(const char *str, const char *p, int s) {
++ return Py_CompileString(str,p,s);
++}
++
++
+ /* Create the function table */
+
+ typedef struct _python_func_table {
+@@ -919,16 +941,16 @@
+ /* 4 */
+ { (void *)Py_IsInitialized, 4, "Py_IsInitialized" },
+ /* 5 */
+- { (void *)PyRun_SimpleString, 5, "PyRun_SimpleString" },
++ { (void *)wrap_PyRun_SimpleString, 5, "PyRun_SimpleString" },
+ /* 6 */
+- { (void *)PyRun_AnyFile, 6, "PyRun_AnyFile" },
+- { (void *)PyRun_SimpleFile, 6, "PyRun_SimpleFile" },
+- { (void *)PyRun_InteractiveOne, 6, "PyRun_InteractiveOne" },
+- { (void *)PyRun_InteractiveLoop, 6, "PyRun_InteractiveLoop" },
++ { (void *)wrap_PyRun_AnyFile, 6, "PyRun_AnyFile" },
++ { (void *)wrap_PyRun_SimpleFile, 6, "PyRun_SimpleFile" },
++ { (void *)wrap_PyRun_InteractiveOne, 6, "PyRun_InteractiveOne" },
++ { (void *)wrap_PyRun_InteractiveLoop, 6, "PyRun_InteractiveLoop" },
+ { (void *)Py_FdIsInteractive, 6, "Py_FdIsInteractive" },
+ /* 7 */
+- { (void *)PyRun_AnyFileEx, 7, "PyRun_AnyFileEx" },
+- { (void *)PyRun_SimpleFileEx, 7, "PyRun_SimpleFileEx" },
++ { (void *)wrap_PyRun_AnyFileEx, 7, "PyRun_AnyFileEx" },
++ { (void *)wrap_PyRun_SimpleFileEx, 7, "PyRun_SimpleFileEx" },
+ /* 8 */
+ { (void *)Py_GetProgramName, 8, "Py_GetProgramName" },
+ { (void *)Py_GetPythonHome, 8, "Py_GetPythonHome" },
+@@ -942,13 +964,13 @@
+ { (void *)Py_GetCompiler, 8, "Py_GetCompiler" },
+ { (void *)Py_GetBuildInfo, 8, "Py_GetBuildInfo" },
+ /* 9 */
+- { (void *)PyRun_String, 9, "PyRun_String" },
++ { (void *)wrap_PyRun_String, 9, "PyRun_String" },
+ /* 10 */
+- { (void *)PyRun_File, 10, "PyRun_File" },
++ { (void *)wrap_PyRun_File, 10, "PyRun_File" },
+ /* 11 */
+- { (void *)PyRun_FileEx, 11, "PyRun_FileEx" },
++ { (void *)wrap_PyRun_FileEx, 11, "PyRun_FileEx" },
+ /* 12 */
+- { (void *)Py_CompileString, 12, "Py_CompileString" },
++ { (void *)wrap_Py_CompileString, 12, "Py_CompileString" },
+
+ /* Object */
+ /* 13 */
+@@ -1062,8 +1084,9 @@
+ { (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 */
+
Propchange: trunk/packages/pycaml/trunk/debian/patches/wrap_pycall.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/packages/pycaml/trunk/debian/pycaml.doc-base
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pycaml/trunk/debian/pycaml.doc-base?rev=5681&op=diff
==============================================================================
--- trunk/packages/pycaml/trunk/debian/pycaml.doc-base (original)
+++ trunk/packages/pycaml/trunk/debian/pycaml.doc-base Fri May 23 12:35:50 2008
@@ -2,7 +2,7 @@
Title: Pycaml Manual
Author: Art Yerkes <arty at users.sourceforge.net>
Abstract: This manual describes the usage of Pycaml, an OCaml to Python interface.
-Section: programming
+Section: Programming/OCaml
Format: HTML
Index: /usr/share/doc/pycaml/pycaml.html
Modified: trunk/packages/pycaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pycaml/trunk/debian/rules?rev=5681&op=diff
==============================================================================
--- trunk/packages/pycaml/trunk/debian/rules (original)
+++ trunk/packages/pycaml/trunk/debian/rules Fri May 23 12:35:50 2008
@@ -5,6 +5,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -36,7 +39,7 @@
#CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
build: ocamlinit build-stamp
-build-stamp: config.status
+build-stamp: config.status patch-stamp
dh_testdir
cp debian/Makefile .
@@ -45,7 +48,8 @@
touch build-stamp
-clean:
+clean: clean1 unpatch
+clean1:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -105,4 +109,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit
+.PHONY: build clean binary-indep binary-arch binary install ocamlinit patch unpatch clean1
More information about the Pkg-ocaml-maint-commits
mailing list