The following commit has been merged in the master branch: commit e53276342fcb7b9eee391493a80dc2e490b27586 Author: Mehdi Dogguy <dog...@pps.jussieu.fr> Date: Sat Jul 4 21:43:07 2009 +0200
Remove one part of the patch as it was included upstream diff --git a/debian/changelog b/debian/changelog index 486bdd3..1cf408b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocamlgraph (1.1-1) unstable; urgency=low + + * New Upstream Version + + -- Mehdi Dogguy <dog...@pps.jussieu.fr> Wed, 24 Jun 2009 13:07:24 +0200 + ocamlgraph (1.0-2) unstable; urgency=low * Modify 01_makefile.dpatch to: diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch index 259c121..2d32b3b 100755 --- a/debian/patches/01_makefile.dpatch +++ b/debian/patches/01_makefile.dpatch @@ -23,20 +23,6 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I . -@@ -157,11 +160,11 @@ - - $(VIEWER_DIR)/viewgraph.byte: $(CMA) $(VIEWER_CMO) - $(OCAMLC) -g -o $@ $(VIEWER_INCLUDES) \ -- lablgtk.cma lablgnomecanvas.cma $^ -+ lablgtk.cma gtkInit.cmo lablgnomecanvas.cma $^ - - $(VIEWER_DIR)/viewgraph.opt: $(CMXA) $(VIEWER_CMX) - $(OCAMLOPT) -o $@ $(VIEWER_INCLUDES) \ -- lablgtk.cmxa lablgnomecanvas.cmxa $^ -+ lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa $^ - - # Examples - ########## @@ -240,44 +243,43 @@ DESTDIR = -- ocamlgraph packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits