[Pkg-ocaml-maint-commits] r1799 - in trunk/packages/cairo-ocaml/trunk/debian: . patches

[Samuel Mimram]

Author: smimram-guest
Date: 2005-09-30 16:50:46 +0000 (Fri, 30 Sep 2005)
New Revision: 1799

Added:
   trunk/packages/cairo-ocaml/trunk/debian/patches/
   trunk/packages/cairo-ocaml/trunk/debian/patches/00list
   trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch
Modified:
   trunk/packages/cairo-ocaml/trunk/debian/changelog
   trunk/packages/cairo-ocaml/trunk/debian/control
   trunk/packages/cairo-ocaml/trunk/debian/rules
Log:
Fix the FTBFS on sparc.

Modified: trunk/packages/cairo-ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/changelog	2005-09-29 20:26:38 UTC (rev 1798)
+++ trunk/packages/cairo-ocaml/trunk/debian/changelog	2005-09-30 16:50:46 UTC (rev 1799)
@@ -1,3 +1,10 @@
+cairo-ocaml (20050918-3) unstable; urgency=low
+
+  * Using dpatch to handle patches.
+  * Added caml_stat patch to solve the FTBFS on sparc.
+
+ -- Samuel Mimram <smimram at debian.org>  Fri, 30 Sep 2005 18:29:11 +0200
+
 cairo-ocaml (20050918-2) unstable; urgency=low
 
   * Make configure executable to solve the FTBFS.

Modified: trunk/packages/cairo-ocaml/trunk/debian/control
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/control	2005-09-29 20:26:38 UTC (rev 1798)
+++ trunk/packages/cairo-ocaml/trunk/debian/control	2005-09-30 16:50:46 UTC (rev 1799)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), automake1.9, autoconf, ocaml-findlib, ocaml-nox-3.08.3, libcairo2-dev, liblablgtk2-ocaml-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, automake1.9, autoconf, ocaml-findlib, ocaml-nox-3.08.3, libcairo2-dev, liblablgtk2-ocaml-dev
 Standards-Version: 3.6.2
 
 Package: libcairo-ocaml

Added: trunk/packages/cairo-ocaml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/patches/00list	2005-09-29 20:26:38 UTC (rev 1798)
+++ trunk/packages/cairo-ocaml/trunk/debian/patches/00list	2005-09-30 16:50:46 UTC (rev 1799)
@@ -0,0 +1 @@
+caml_stat

Added: trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch	2005-09-29 20:26:38 UTC (rev 1798)
+++ trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch	2005-09-30 16:50:46 UTC (rev 1799)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## caml_stat.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use the new caml names convention (functions should be prefixed by
+## DP: caml_).
+
+ at DPATCH@
+diff -urNad cairo-ocaml-20050918~/src/ml_cairo.c cairo-ocaml-20050918/src/ml_cairo.c
+--- cairo-ocaml-20050918~/src/ml_cairo.c	2005-09-18 20:18:51.000000000 +0200
++++ cairo-ocaml-20050918/src/ml_cairo.c	2005-09-30 18:45:21.000000000 +0200
+@@ -70,11 +70,11 @@
+ 		  Double_array_length (d), Double_val (off));
+ #else
+   int i, ndash = Double_array_length (d);
+-  double *dashes = stat_alloc (ndash * sizeof (double));
++  double *dashes = caml_stat_alloc (ndash * sizeof (double));
+   for (i = 0; i < ndash, i++)
+     dashes[i] = Double_field (d, i);
+   cairo_set_dash (cairo_t_val (cr), dashes, ndash, Double_val (off));
+-  stat_free (dashes);
++  caml_stat_free (dashes);
+ #endif
+   check_cairo_status (cr);
+   return Val_unit;


Property changes on: trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/cairo-ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/rules	2005-09-29 20:26:38 UTC (rev 1798)
+++ trunk/packages/cairo-ocaml/trunk/debian/rules	2005-09-30 16:50:46 UTC (rev 1799)
@@ -6,6 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# We want to use dpatch
+include /usr/share/dpatch/dpatch.make
+
 DESTDIR = $(CURDIR)/debian/tmp
 
 configure:
@@ -17,7 +20,7 @@
 	chmod +x configure
 	./configure --with-gtk
 
-build: build-stamp
+build: patch-stamp build-stamp
 build-stamp:  config.status
 	dh_testdir
 
@@ -27,7 +30,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp