[Pkg-ocaml-maint-commits] [SCM] pycaml packaging branch, master, updated. debian/0.82-9-8-ge16b4b5

Fri Jun 5 20:36:47 UTC 2009

The following commit has been merged in the master branch:
commit 5925c77a15c8fdd4a13f59ed0168b487f12fb4cf
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jun 5 17:04:53 2009 +0200

    Use quilt instead of dpatch

diff --git a/debian/control b/debian/control
index ba51504..1a93fb9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,14 @@ Section: libdevel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 7), python-support (>= 0.3), dh-ocaml, ocaml-nox (>= 3.11), python-dev (>= 2.3), ocamlmakefile, dpatch
+Build-Depends:
+ debhelper (>= 7),
+ quilt,
+ python-support (>= 0.3),
+ dh-ocaml,
+ ocaml-nox (>= 3.11),
+ python-dev (>= 2.3),
+ ocamlmakefile
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pycaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pycaml.git
diff --git a/debian/patches/wrap_pycall.dpatch b/debian/patches/0001-Wrap-Py_-calls.patch
old mode 100755
new mode 100644
similarity index 81%
rename from debian/patches/wrap_pycall.dpatch
rename to debian/patches/0001-Wrap-Py_-calls.patch
index 78f0765..f175e00
--- a/debian/patches/wrap_pycall.dpatch
+++ b/debian/patches/0001-Wrap-Py_-calls.patch
@@ -1,13 +1,18 @@
-#! /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.
+From: Sylvain Le Gall <gildor at debian.org>
+Date: Fri, 5 Jun 2009 17:01:00 +0200
+Subject: [PATCH] Wrap Py_* calls
 
- 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
+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(-)
+
+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@
@@ -17,7 +22,7 @@ diff -urNad trunk~/Makefile.in trunk/Makefile.in
  
  #
  # The rest is automatic
-@@ -18,23 +20,23 @@
+@@ -18,23 +20,23 @@ LIBS=	pycaml_ml.o \
  all: pycamltop pycamltest ocamlobj
  
  pycamltop: pycaml_ml.o pycaml.cmo
@@ -48,10 +53,11 @@ diff -urNad trunk~/Makefile.in trunk/Makefile.in
 -	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 @@
+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 *)
@@ -61,10 +67,11 @@ diff -urNad trunk~/pycaml.ml trunk/pycaml.ml
  
  (* 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 @@
+diff --git a/pycaml_ml.c b/pycaml_ml.c
+index 0edb262..0f69368 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 */
@@ -74,7 +81,7 @@ diff -urNad trunk~/pycaml_ml.c trunk/pycaml_ml.c
  
  /* Error handling definitions */
  
-@@ -897,6 +898,27 @@
+@@ -897,6 +898,27 @@ value pyunwrapvalue( value cb ) {
      CAMLreturn(*v);
  }
  
@@ -102,7 +109,7 @@ diff -urNad trunk~/pycaml_ml.c trunk/pycaml_ml.c
  /* Create the function table */
  
  typedef struct _python_func_table {
-@@ -919,16 +941,16 @@
+@@ -919,16 +941,16 @@ python_func_table the_python_func_table[] = {
  /* 4 */
      { (void *)Py_IsInitialized, 4, "Py_IsInitialized" },
  /* 5 */
@@ -126,7 +133,7 @@ diff -urNad trunk~/pycaml_ml.c trunk/pycaml_ml.c
  /* 8 */
      { (void *)Py_GetProgramName, 8, "Py_GetProgramName" },
      { (void *)Py_GetPythonHome, 8, "Py_GetPythonHome" },
-@@ -942,13 +964,13 @@
+@@ -942,13 +964,13 @@ python_func_table the_python_func_table[] = {
      { (void *)Py_GetCompiler, 8, "Py_GetCompiler" },
      { (void *)Py_GetBuildInfo, 8, "Py_GetBuildInfo" },
  /* 9 */
@@ -144,7 +151,7 @@ diff -urNad trunk~/pycaml_ml.c trunk/pycaml_ml.c
  
  /* Object */
  /* 13 */
-@@ -1062,8 +1084,9 @@
+@@ -1062,8 +1084,9 @@ python_func_table the_python_func_table[] = {
      { (void *)PySlice_New, 42, "PySlice_New" },
  /* 43 */
      { (void *)PySlice_GetIndices, 43, "PySlice_GetIndices" },
@@ -156,3 +163,4 @@ diff -urNad trunk~/pycaml_ml.c trunk/pycaml_ml.c
  
  /* Error handling definitions */
  
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1329a26..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-wrap_pycall
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2616c15
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Wrap-Py_-calls.patch
diff --git a/debian/rules b/debian/rules
index 91f90e8..f03ef8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/ocaml/ocamlinit.mk
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -34,7 +34,7 @@ config.status: configure
 	#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 patch-stamp
+build-stamp: config.status $(QUILT_STAMPFN)
 	dh_testdir
 
 	cp debian/Makefile .

-- 
pycaml packaging

