[Pkg-ocaml-maint-commits] r4085 - in /trunk/packages/cairo-ocaml/trunk/debian: changelog patches/00list patches/fun_names.dpatch rules

smimram at users.alioth.debian.org smimram at users.alioth.debian.org
Wed Jul 18 08:07:09 UTC 2007 

Author: smimram
Date: Wed Jul 18 08:07:08 2007
New Revision: 4085

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4085
Log:
Correct the names of some binding functions.

Added:
    trunk/packages/cairo-ocaml/trunk/debian/patches/fun_names.dpatch   (with props)
Modified:
    trunk/packages/cairo-ocaml/trunk/debian/changelog
    trunk/packages/cairo-ocaml/trunk/debian/patches/00list
    trunk/packages/cairo-ocaml/trunk/debian/rules

Modified: trunk/packages/cairo-ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cairo-ocaml/trunk/debian/changelog?rev=4085&op=diff
==============================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/changelog (original)
+++ trunk/packages/cairo-ocaml/trunk/debian/changelog Wed Jul 18 08:07:08 2007
@@ -1,3 +1,11 @@
+cairo-ocaml (20070306-3) unstable; urgency=low
+
+  * Added fun_names.dpatch to correct the names of some binding functions
+    (thanks Chris King), closes: #433583.
+  * Don't ignore errors on make clean.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 18 Jul 2007 09:51:13 +0200
+
 cairo-ocaml (20070306-2) unstable; urgency=low
 
   * Added matrix_out.dpatch to correcly build on archs without ALIGN_DOUBLE.

Modified: trunk/packages/cairo-ocaml/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cairo-ocaml/trunk/debian/patches/00list?rev=4085&op=diff
==============================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/patches/00list (original)
+++ trunk/packages/cairo-ocaml/trunk/debian/patches/00list Wed Jul 18 08:07:08 2007
@@ -1,1 +1,2 @@
 matrix_out
+fun_names

Added: trunk/packages/cairo-ocaml/trunk/debian/patches/fun_names.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cairo-ocaml/trunk/debian/patches/fun_names.dpatch?rev=4085&op=file
==============================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/patches/fun_names.dpatch (added)
+++ trunk/packages/cairo-ocaml/trunk/debian/patches/fun_names.dpatch Wed Jul 18 08:07:08 2007
@@ -1,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fun_names.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correct the names of some binding functions.
+## DP: See #433583.
+
+ at DPATCH@
+diff -urNad cairo-ocaml-20070306~/src/cairo.ml cairo-ocaml-20070306/src/cairo.ml
+--- cairo-ocaml-20070306~/src/cairo.ml	2007-07-18 10:01:19.000000000 +0200
++++ cairo-ocaml-20070306/src/cairo.ml	2007-07-18 10:01:20.000000000 +0200
+@@ -141,7 +141,7 @@
+ external translate : t -> tx:float -> ty:float -> unit = "ml_cairo_translate"
+ external scale : t -> sx:float -> sy:float -> unit = "ml_cairo_scale"
+ external rotate : t -> angle:float -> unit = "ml_cairo_rotate"
+-external transform : t -> matrix -> unit = "ml_cairo_trasnform"
++external transform : t -> matrix -> unit = "ml_cairo_transform"
+ external set_matrix : t -> matrix -> unit = "ml_cairo_set_matrix"
+ external identity_matrix : t -> unit = "ml_cairo_identity_matrix"
+ external user_to_device : t -> point -> point = "ml_cairo_user_to_device"
+@@ -307,7 +307,7 @@
+   then (Obj.magic f : [`Any|`TOY] t) 
+   else invalid_arg "Cairo: scaled font downcast"
+ external font_extents : [> `Any] t -> font_extents = "ml_cairo_scaled_font_extents"
+-external text_extents : [> `Any] t -> string -> text_extents = "ml_cairo_scaled_text_extents"
++external text_extents : [> `Any] t -> string -> text_extents = "ml_cairo_scaled_font_text_extents"
+ external glyph_extents : [> `Any] t -> glyph array -> text_extents = "ml_cairo_scaled_font_glyph_extents"
+ external get_font_face : ([>`Any] as 'a) t -> 'a font_face = "ml_cairo_scaled_font_get_font_face"
+ external get_font_matrix : ([>`Any] as 'a) t -> matrix = "ml_cairo_scaled_font_get_font_matrix"
+diff -urNad cairo-ocaml-20070306~/src/cairo.mli cairo-ocaml-20070306/src/cairo.mli
+--- cairo-ocaml-20070306~/src/cairo.mli	2007-07-18 10:01:19.000000000 +0200
++++ cairo-ocaml-20070306/src/cairo.mli	2007-07-18 10:01:20.000000000 +0200
+@@ -155,7 +155,7 @@
+ external translate : t -> tx:float -> ty:float -> unit = "ml_cairo_translate"
+ external scale : t -> sx:float -> sy:float -> unit = "ml_cairo_scale"
+ external rotate : t -> angle:float -> unit = "ml_cairo_rotate"
+-external transform : t -> matrix -> unit = "ml_cairo_trasnform"
++external transform : t -> matrix -> unit = "ml_cairo_transform"
+ external set_matrix : t -> matrix -> unit = "ml_cairo_set_matrix"
+ external identity_matrix : t -> unit = "ml_cairo_identity_matrix"
+ 
+@@ -297,7 +297,7 @@
+ val get_type : [> `Any] t -> [font_type|`Any]
+ val downcast_to_toy : [> `Any] t -> [`Any|`TOY] t
+ external font_extents : [> `Any] t -> font_extents = "ml_cairo_scaled_font_extents"
+-external text_extents : [> `Any] t -> string -> text_extents = "ml_cairo_scaled_text_extents"
++external text_extents : [> `Any] t -> string -> text_extents = "ml_cairo_scaled_font_text_extents"
+ external glyph_extents : [>`Any] t -> glyph array -> text_extents = "ml_cairo_scaled_font_glyph_extents"
+ external get_font_face : ([>`Any] as 'a) t -> 'a font_face = "ml_cairo_scaled_font_get_font_face"
+ external get_font_matrix : ([>`Any] as 'a) t -> matrix = "ml_cairo_scaled_font_get_font_matrix"
+diff -urNad cairo-ocaml-20070306~/src/ml_cairo_font.c cairo-ocaml-20070306/src/ml_cairo_font.c
+--- cairo-ocaml-20070306~/src/ml_cairo_font.c	2007-07-18 10:01:20.000000000 +0200
++++ cairo-ocaml-20070306/src/ml_cairo_font.c	2007-07-18 10:02:06.000000000 +0200
+@@ -101,7 +101,7 @@
+ }
+ 
+ CAMLprim value
+-ml_scaled_font_text_extents (value sf, value v_utf8)
++ml_cairo_scaled_font_text_extents (value sf, value v_utf8)
+ {
+   cairo_text_extents_t c_extents;
+   cairo_scaled_font_text_extents (cairo_scaled_font_t_val (sf), String_val (v_utf8), &c_extents);

Propchange: trunk/packages/cairo-ocaml/trunk/debian/patches/fun_names.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/cairo-ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cairo-ocaml/trunk/debian/rules?rev=4085&op=diff
==============================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/rules (original)
+++ trunk/packages/cairo-ocaml/trunk/debian/rules Wed Jul 18 08:07:08 2007
@@ -41,8 +41,8 @@
 	dh_testroot
 	rm -f build-stamp
 
-	-$(MAKE) clean
-	-$(MAKE) distclean
+	[ ! -f config.make ] || $(MAKE) clean
+	[ ! -f config.make ] || $(MAKE) distclean
 
 	dh_clean

More information about the Pkg-ocaml-maint-commits mailing list