[Pkg-ocaml-maint-commits] [SCM] cairo-ocaml packaging branch, master, updated. debian/20070908-1-15-gd56d5fb

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 932b74c1e39123c29c4c997d14056ab4f315887c
Author: Samuel Mimram <smimram at debian.org>
Date:   Mon Feb 23 18:17:25 2009 +0100

    Remove fun_names.dpatch, integrated upstream.

diff --git a/debian/changelog b/debian/changelog
index f2a73f0..98fa5dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,12 +5,13 @@ cairo-ocaml (20090223-1) UNRELEASED; urgency=low
 
   [ Samuel Mimram ]
   * New CVS snapshot.
+  * Remove fun_names.dpatch, integrated upstream.
   * Switch packaging to git
   * Use dh-ocaml.
   * Update compat to 7.
   * Update standards version to 3.8.0.
 
- -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 18:08:18 +0100
+ -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 18:17:11 +0100
 
 cairo-ocaml (20070908-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 9746452..e69de29 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +0,0 @@
-fun_names
diff --git a/debian/patches/fun_names.dpatch b/debian/patches/fun_names.dpatch
deleted file mode 100755
index db6ebdc..0000000
--- a/debian/patches/fun_names.dpatch
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /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);

-- 
cairo-ocaml packaging