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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit e2ea5ff2ed035161a6100e10504810d8f74a7287
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Thu May 14 12:43:20 2009 +0200

    Install graph.o

diff --git a/debian/changelog b/debian/changelog
index 6cac849..7c2791c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ocamlgraph (1.0-2) UNRELEASED; urgency=low
 
-  * Modify 01_makefile.dpatch to install .cmi and .o files of the viewer.
+  * Modify 01_makefile.dpatch to:
+    - install .cmi and .o files of the viewer
+    - install graph.o
 
  -- 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 93065e2..decc945 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-12 17:31:05.000000000 +0200
++++ ocamlgraph/Makefile.in	2009-05-14 12:41:30.000000000 +0200
 @@ -143,10 +143,13 @@
  
  viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST)
@@ -56,7 +56,7 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
 +install: install-bin
 +	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) $(VIEWER_OFILES) "$(DESTDIR)$(OCAMLLIB)"
++	cp -f graph$(LIBEXT) graph.cmx graph.o $(CMXA) $(VIEWER_CMX) $(VIEWER_OFILES) "$(DESTDIR)$(OCAMLLIB)"
 +endif 
  
 -install-findlib: META
@@ -64,8 +64,9 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
 +install-findlib: META install-bin
 +ifeq ($(OCAMLBEST),opt)
  	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
- 		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
+-		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
 -		$(VIEWER_CMX) $(VIEWER_CMO)
++		graph$(LIBEXT) graph.cmx graph.o graph.cmo graph.cmi $(CMA) $(CMXA) \
 +		$(VIEWER_CMX) $(VIEWER_CMO) $(VIEWER_CMI) $(VIEWER_OFILES)
 +else
 +	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \

-- 
ocamlgraph packaging