[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.4-1-5-g8310f6d

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 9e62a3544a4e9cc1dc7565f2fcd139acb8a67720
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat May 15 14:46:06 2010 +0200

    Remove 0003-dgraph-handle-dotted-ellipse.patch which is now released

diff --git a/debian/changelog b/debian/changelog
index 5a7f0a1..4b6950c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ocamlgraph (1.5-1) UNRELEASED; urgency=low
 
   * New upstream release
+    + Remove 0003-dgraph-handle-dotted-ellipse.patch
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sat, 15 May 2010 14:38:07 +0200
 
diff --git a/debian/patches/0003-dgraph-handle-dotted-ellipse.patch b/debian/patches/0003-dgraph-handle-dotted-ellipse.patch
deleted file mode 100644
index 41bce74..0000000
--- a/debian/patches/0003-dgraph-handle-dotted-ellipse.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Sun, 25 Apr 2010 14:54:50 +0200
-Subject: [PATCH] dgraph: handle dotted ellipse
-
-Patch stolen from upstream dev version
----
- dgraph/dGraphViewItem.ml |   27 ++++++++++++---------------
- 1 files changed, 12 insertions(+), 15 deletions(-)
-
-diff --git a/dgraph/dGraphViewItem.ml b/dgraph/dGraphViewItem.ml
-index 35cb4fc..30c67a2 100644
---- a/dgraph/dGraphViewItem.ml
-+++ b/dgraph/dGraphViewItem.ml
-@@ -207,20 +207,23 @@ class shape ~fill shape init_props = object (self)
- 
- end
- 
--let ellipse ~fill draw_st group pos w h =
--  let((x1,y1), (x2,y2)) = XDot.bounding_box pos w h in
--  let props = [ pen_color draw_st; fill_color draw_st ] in
--  let ellip = GnoCanvas.ellipse group ~x1 ~y1 ~x2 ~y2 ~props in
--  new shape ~fill (SEllipse ellip) props
--
--let polygon ~fill draw_st group pts =
-+let get_props draw_st =
-   let base_props = [ pen_color draw_st; fill_color draw_st ] in
-   let fold_sty_attr props = function
-     | Dashed -> `DASH (0., [|10.|]) :: props
-     | Dotted -> `DASH (0., [|2.; 10.|])  :: props
-     | _ -> props
-   in
--  let props = List.fold_left fold_sty_attr base_props draw_st.style in
-+  List.fold_left fold_sty_attr base_props draw_st.style
-+
-+let ellipse ~fill draw_st group pos w h =
-+  let((x1,y1), (x2,y2)) = XDot.bounding_box pos w h in
-+  let props = get_props draw_st in
-+  let ellip = GnoCanvas.ellipse group ~x1 ~y1 ~x2 ~y2 ~props in
-+  new shape ~fill (SEllipse ellip) props
-+
-+let polygon ~fill draw_st group pts =
-+  let props = get_props draw_st in
-   let points = flatten_points pts in
-   let poly = GnoCanvas.polygon group ~points ~props in
-   new shape ~fill (SPolygon poly) props
-@@ -248,13 +251,7 @@ let bspline ~fill draw_st group pts =
-   let path =
-     pathdef (Array.fold_right (fun p acc -> XDot.conv_coord p :: acc) pts [])
-   in
--  let base_props = [ pen_color draw_st; fill_color draw_st ] in
--  let fold_sty_attr props = function
--    | Dashed -> `DASH (0., [|10.|]) :: props
--    | Dotted -> `DASH (0., [|2.; 10.|])  :: props
--    | _ -> props
--  in
--  let props = List.fold_left fold_sty_attr base_props draw_st.style in
-+  let props = get_props draw_st in
-   let bpath = GnoCanvas.bpath group ~bpath:path ~props in
-   new shape ~fill (SBSpline bpath) props
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 8fddf54..827a58e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-prefix-binary-names-with-ocaml-and-do-not-install-us.patch
 0002-avoid-referencing-non-existent-icon-ed_icon.xpm.patch
-0003-dgraph-handle-dotted-ellipse.patch

-- 
ocamlgraph packaging