[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.3+debian-2-7-g7962c41

Mehdi Dogguy mehdi at debian.org
Tue Apr 27 14:41:10 UTC 2010 

The following commit has been merged in the master branch:
commit b766368364a3c26bcf4bf65952cd583a6e5968f7
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Apr 25 15:00:13 2010 +0200

    Convert patches to quilt format

diff --git a/debian/changelog b/debian/changelog
index ac9eb7f..060ace5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 ocamlgraph (1.4+debian-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Convert patches to quilt format
 
- -- Mehdi Dogguy <mehdi at debian.org>  Sun, 25 Apr 2010 14:38:37 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 25 Apr 2010 14:59:27 +0200
 
 ocamlgraph (1.3+debian-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 39aee15..46e05b6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  cdbs,
  dh-ocaml (>= 0.9),
  debhelper (>= 7),
- dpatch,
+ quilt,
  ocaml-nox (>= 3.11.1),
  ocaml-findlib (>> 1.2.4-2),
  liblablgtk2-ocaml-dev,
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/0001-prefix-binary-names-with-ocaml-and-do-not-install-us.patch
old mode 100755
new mode 100644
similarity index 65%
rename from debian/patches/01_makefile.dpatch
rename to debian/patches/0001-prefix-binary-names-with-ocaml-and-do-not-install-us.patch
index a3e1abb..5bb3904
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/0001-prefix-binary-names-with-ocaml-and-do-not-install-us.patch
@@ -1,14 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile.dpatch by Mehdi Dogguy <mehdi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: prefix binary names with "ocaml" and do not install useless files
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 25 Apr 2010 14:50:30 +0200
+Subject: [PATCH] prefix binary names with 'ocaml' and do not install useless files
 
- at DPATCH@
-diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
---- ocamlgraph~/Makefile.in	2009-10-13 21:38:13.000000000 +0200
-+++ ocamlgraph/Makefile.in	2009-10-13 22:16:08.000000000 +0200
-@@ -293,18 +293,20 @@
+---
+ Makefile.in |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f138175..136909e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -293,11 +293,13 @@ install: install-$(OCAMLBEST) install-byte
  	mkdir -p $(BINDIR)
  ifeq (@LABLGNOMECANVAS@,yes)
  ifeq ($(OCAMLBEST),byte)
@@ -26,11 +28,12 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
  endif
  endif
  
- install-byte: 
+@@ -305,6 +307,7 @@ install-byte:
  	mkdir -p $(INSTALL_LIBDIR)
  	cp -f graph.cmo graph.cmi $(CMA) $(INSTALL_LIBDIR)
--	cp -f $(SRCDIR)/*.mli $(INSTALL_LIBDIR)
+ 	cp -f $(SRCDIR)/*.mli $(INSTALL_LIBDIR)
 +	cp -f META $(SRCDIR)/*.mli $(INSTALL_LIBDIR)
  ifeq (@LABLGNOMECANVAS@,yes)
  	mkdir -p $(BINDIR)
  	cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte
+-- 
diff --git a/debian/patches/03_hide_b0rken_icon.dpatch b/debian/patches/0002-avoid-referencing-non-existent-icon-ed_icon.xpm.patch
old mode 100755
new mode 100644
similarity index 57%
rename from debian/patches/03_hide_b0rken_icon.dpatch
rename to debian/patches/0002-avoid-referencing-non-existent-icon-ed_icon.xpm.patch
index fabc6ed..e9237d6
--- a/debian/patches/03_hide_b0rken_icon.dpatch
+++ b/debian/patches/0002-avoid-referencing-non-existent-icon-ed_icon.xpm.patch
@@ -1,34 +1,36 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_hide_b0rken_icon.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: avoid referencing non existent icon ed_icon.xpm
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 25 Apr 2010 14:51:39 +0200
+Subject: [PATCH] avoid referencing non existent icon ed_icon.xpm
 
- at DPATCH@
-diff -urNad trunk~/editor/ed_main.ml trunk/editor/ed_main.ml
---- trunk~/editor/ed_main.ml	2008-04-03 17:16:32.000000000 +0200
-+++ trunk/editor/ed_main.ml	2008-06-21 15:42:17.000000000 +0200
-@@ -899,7 +899,7 @@
+---
+ editor/ed_main.ml |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/editor/ed_main.ml b/editor/ed_main.ml
+index b5ece22..e66fb4a 100644
+--- a/editor/ed_main.ml
++++ b/editor/ed_main.ml
+@@ -899,7 +899,7 @@ described in file LICENSE.
  This software is distributed in the hope that it will be useful, 
  but WITHOUT ANY WARRANTY; without even the implied warranty of 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 -    ~logo:(GdkPixbuf.from_file"ed_icon.xpm" )
-+    (* ~logo:(GdkPixbuf.from_file"ed_icon.xpm" ) *)
++(*    ~logo:(GdkPixbuf.from_file"ed_icon.xpm" )*)
      ~name:ed_name
      ~version:"0.99"
      ~website:"http://ocamlgraph.lri.fr/"
-@@ -928,12 +928,14 @@
-   let iter = buffer#get_iter_at_char 0 in
+@@ -929,11 +929,13 @@ let handbook_text (view:GText.view) =
    (* title *)
    buffer#insert ~iter ~tag_names:["title"] (ed_name^" Handbook\n");
-+  (*
    (* editor's icon *)
++(*
    let image_anchor = buffer#create_child_anchor iter in
    let image = GMisc.image 
      ~pixbuf:(GdkPixbuf.from_file_at_size "ed_icon.xpm" ~width:70 ~height:70) 
      () in
    view#add_child_at_anchor image#coerce image_anchor;
-+  *)
++*)
    buffer#insert ~iter "\n\n\n";
    let start,stop = buffer#bounds in
    buffer#apply_tag_by_name "center" ~start ~stop ; 
+-- 
diff --git a/debian/patches/0003-dgraph-handle-dotted-ellipse.patch b/debian/patches/0003-dgraph-handle-dotted-ellipse.patch
new file mode 100644
index 0000000..41bce74
--- /dev/null
+++ b/debian/patches/0003-dgraph-handle-dotted-ellipse.patch
@@ -0,0 +1,61 @@
+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/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index c2409be..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../upstream
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b18d699..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_makefile
-03_hide_b0rken_icon
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8fddf54
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+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
diff --git a/debian/rules b/debian/rules
index 8fe2749..2e492fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@
 include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include $(CURDIR)/debian/mk/docbook-manpage.mk
 
 DEV_PKG = libocamlgraph-ocaml-dev

-- 
ocamlgraph packaging

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