[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.0-1-9-g499a849

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit a36aab887fb88bc71b3bfb623882db03385b1f9f
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Thu May 14 18:13:44 2009 +0200

    viewgraph has to link against gtkinit

diff --git a/debian/changelog b/debian/changelog
index 7c2791c..d9d277b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ocamlgraph (1.0-2) UNRELEASED; urgency=low
   * Modify 01_makefile.dpatch to:
     - install .cmi and .o files of the viewer
     - install graph.o
+  * viewgraph has to link against gtkinit
+  * Install ocamlgraph-viewer
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Tue, 12 May 2009 13:05:12 +0200
 
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch
index decc945..259c121 100755
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.dpatch
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
 --- ocamlgraph~/Makefile.in	2009-05-12 13:10:12.000000000 +0200
-+++ ocamlgraph/Makefile.in	2009-05-14 12:41:30.000000000 +0200
++++ ocamlgraph/Makefile.in	2009-05-14 18:13:16.000000000 +0200
 @@ -143,10 +143,13 @@
  
  viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST)
@@ -23,6 +23,20 @@ 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	=
diff --git a/debian/rules b/debian/rules
index f2c0376..877766a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,12 +58,6 @@ DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/ocamlgraph-editor.xml
 DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml      \
                                  $(CURDIR)/debian/xml-man/en/refentryinfo.xml
 
-# TODO: remove when ocamlgraph-editor will work
-install/ocamlgraph-editor::
-	-$(RM) '$(CURDIR)/debian/ocamlgraph-editor/usr/bin/ocamlgraph-viewer.byte'
-	-$(RM) '$(CURDIR)/debian/ocamlgraph-editor/usr/bin/ocamlgraph-viewer.opt'
-	-$(RM) '$(CURDIR)/debian/ocamlgraph-editor/usr/bin/ocamlgraph-viewer'
-
 clean::
 	# Restore file deleted; to be removed when upstream will correct this
 	-cp '$(CURDIR)/src/dot_parser.ml.old'  '$(CURDIR)/src/dot_parser.ml'

-- 
ocamlgraph packaging