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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit ad1446b9a0062545ff0b4ab8832392fed487dc89
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Tue May 12 13:06:04 2009 +0200

    Modify 01_makefile.dpatch to install cmi files of the viewer

diff --git a/debian/changelog b/debian/changelog
index 5273d3d..6cac849 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocamlgraph (1.0-2) UNRELEASED; urgency=low
+
+  * Modify 01_makefile.dpatch to install .cmi and .o files of the viewer.
+
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Tue, 12 May 2009 13:05:12 +0200
+
 ocamlgraph (1.0-1) unstable; urgency=low
 
   [ Sylvain Le Gall ]
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch
index bff757e..93065e2 100755
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.dpatch
@@ -6,9 +6,9 @@
 
 @DPATCH@
 diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
---- ocamlgraph~/Makefile.in	2009-03-20 11:30:31.000000000 +0100
-+++ ocamlgraph/Makefile.in	2009-03-20 11:30:55.000000000 +0100
-@@ -143,8 +143,10 @@
+--- ocamlgraph~/Makefile.in	2009-05-12 13:10:12.000000000 +0200
++++ ocamlgraph/Makefile.in	2009-05-12 17:31:05.000000000 +0200
+@@ -143,10 +143,13 @@
  
  viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST)
  
@@ -19,8 +19,11 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
 +endif
  VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx)
  VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi)
++VIEWER_OFILES=$(VIEWER_CMO:.cmo=.o)
  
-@@ -240,44 +242,43 @@
+ VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I .
+ 
+@@ -240,44 +243,43 @@
  
  DESTDIR	=
  
@@ -51,9 +54,9 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
 -	cp -f $(VIEWER_DIR)/viewgraph.opt $(BINDIR)/graph-viewer.opt
 -endif
 +install: install-bin
-+	cp -f graph.cmo graph.cmi $(CMA) $(VIEWER_CMO) "$(DESTDIR)$(OCAMLLIB)"
++	cp -f graph.cmo graph.cmi $(CMA) $(VIEWER_CMO) $(VIEWER_CMI) "$(DESTDIR)$(OCAMLLIB)"
 +ifeq ($(OCAMLBEST),opt)
-+	cp -f graph$(LIBEXT) graph.cmx $(CMXA) $(VIEWER_CMX) "$(DESTDIR)$(OCAMLLIB)"
++	cp -f graph$(LIBEXT) graph.cmx $(CMXA) $(VIEWER_CMX) $(VIEWER_OFILES) "$(DESTDIR)$(OCAMLLIB)"
 +endif 
  
 -install-findlib: META
@@ -62,11 +65,12 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
 +ifeq ($(OCAMLBEST),opt)
  	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
  		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
- 		$(VIEWER_CMX) $(VIEWER_CMO)
+-		$(VIEWER_CMX) $(VIEWER_CMO)
++		$(VIEWER_CMX) $(VIEWER_CMO) $(VIEWER_CMI) $(VIEWER_OFILES)
 +else
 +	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
 +		graph.cmo graph.cmi $(CMA) \
-+		$(VIEWER_CMO)
++		$(VIEWER_CMO) $(VIEWER_CMI)
 +endif
  endif
  

-- 
ocamlgraph packaging