[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.2+debian-1-7-g9a2c9bd

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 339ab019fcd599238cd7d6c89818f225f0a313cd
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 13 21:05:44 2009 +0200

    Refresh patch: 01_makefile

diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch
index 3be82bf..a3e1abb 100755
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.dpatch
@@ -1,93 +1,36 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 01_makefile.dpatch by Mehdi Dogguy <mehdi at debian.org>
 ##
-## DP: Install .o files, prefix binary names with "ocaml"
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: prefix binary names with "ocaml" and do not install useless files
 
 @DPATCH@
 diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
---- ocamlgraph~/Makefile.in	2009-09-04 10:12:43.000000000 +0200
-+++ ocamlgraph/Makefile.in	2009-09-04 10:59:23.000000000 +0200
-@@ -31,7 +31,7 @@
- OCAMLDOC = @OCAMLDOC@
- OCAMLLEX = @OCAMLLEX@
- OCAMLYACC= @OCAMLYACC@
--OCAMLLIB = @OCAMLLIB@
-+OCAMLLIB = @OCAMLLIB@/ocamlgraph/
- OCAMLBEST= @OCAMLBEST@
- OCAMLVERSION = @OCAMLVERSION@
- OCAMLWEB = @OCAMLWEB@
-@@ -147,6 +147,7 @@
- VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO))
- VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx)
- VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi)
-+VIEWER_OFILES=$(VIEWER_CMO:.cmo=.o)
- 
- VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I .
- 
-@@ -175,6 +176,7 @@
- DGRAPH_CMO:=$(patsubst %,$(DGRAPH_DIR)/%.cmo, $(DGRAPH_CMO))
- DGRAPH_CMX=$(DGRAPH_CMO:.cmo=.cmx)
- DGRAPH_CMI=$(DGRAPH_CMO:.cmo=.cmi)
-+DGRAPH_OFILES=$(DGRAPH_CMO:.cmo=.o)
- 
- DGRAPH_INCLUDES= @INCLUDEGTK2@ -I $(DGRAPH_DIR) $(INCLUDES) -I .
- 
-@@ -271,41 +273,42 @@
- install: install-$(OCAMLBEST) install-byte
+--- 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 @@
+ 	mkdir -p $(BINDIR)
  ifeq (@LABLGNOMECANVAS@,yes)
  ifeq ($(OCAMLBEST),byte)
 -	cp -f $(BINDIR)/graph-editor.byte $(BINDIR)/graph-editor$(EXE)
 -	cp -f $(BINDIR)/graph-viewer.byte $(BINDIR)/graph-viewer$(EXE)
-+	mv $(BINDIR)/ocamlgraph-editor.byte $(BINDIR)/ocamlgraph-editor$(EXE)
-+	mv $(BINDIR)/ocamlgraph-viewer.byte $(BINDIR)/ocamlgraph-viewer$(EXE)
++	mv $(BINDIR)/graph-editor.byte $(BINDIR)/ocamlgraph-editor$(EXE)
++	mv $(BINDIR)/graph-viewer.byte $(BINDIR)/ocamlgraph-viewer$(EXE)
  else
 -	cp -f $(BINDIR)/graph-editor.opt $(BINDIR)/graph-editor$(EXE)
 -	cp -f $(BINDIR)/graph-viewer.opt $(BINDIR)/graph-viewer$(EXE)
-+	mv $(BINDIR)/ocamlgraph-editor.opt $(BINDIR)/ocamlgraph-editor$(EXE)
-+	mv $(BINDIR)/ocamlgraph-viewer.opt $(BINDIR)/ocamlgraph-viewer$(EXE)
++	mv $(BINDIR)/graph-editor.opt $(BINDIR)/ocamlgraph-editor$(EXE)
++	mv $(BINDIR)/graph-viewer.opt $(BINDIR)/ocamlgraph-viewer$(EXE)
++	mv $(BINDIR)/graph-editor.byte $(BINDIR)/ocamlgraph-editor.byte
++	mv $(BINDIR)/graph-viewer.byte $(BINDIR)/ocamlgraph-viewer.byte
  endif
  endif
  
  install-byte: 
-+	mkdir -p "$(DESTDIR)$(OCAMLLIB)"
- 	cp -f graph.cmo graph.cmi $(CMA) "$(DESTDIR)$(OCAMLLIB)"
- ifeq (@LABLGNOMECANVAS@,yes)
--	cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte
--	cp -f $(VIEWER_CMO) "$(DESTDIR)$(OCAMLLIB)"
--	cp -f $(DGRAPH_CMO) "$(DESTDIR)$(OCAMLLIB)"
--	cp -f $(DGRAPH_DIR)/dgraph.byte $(BINDIR)/graph-viewer.byte
-+	cp -f $(ED_DIR)/editor.byte $(BINDIR)/ocamlgraph-editor.byte
-+	cp -f $(VIEWER_CMO) $(VIEWER_CMI) "$(DESTDIR)$(OCAMLLIB)"
-+	cp -f $(DGRAPH_CMO) $(DGRAPH_CMI) "$(DESTDIR)$(OCAMLLIB)"
-+	cp -f $(DGRAPH_DIR)/dgraph.byte $(BINDIR)/ocamlgraph-viewer.byte
- endif
- 
- install-opt: install-byte
-+	mkdir -p "$(DESTDIR)$(OCAMLLIB)"
- 	cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(DESTDIR)$(OCAMLLIB)"
+ 	mkdir -p $(INSTALL_LIBDIR)
+ 	cp -f graph.cmo graph.cmi $(CMA) $(INSTALL_LIBDIR)
+-	cp -f $(SRCDIR)/*.mli $(INSTALL_LIBDIR)
++	cp -f META $(SRCDIR)/*.mli $(INSTALL_LIBDIR)
  ifeq (@LABLGNOMECANVAS@,yes)
--	cp -f $(ED_DIR)/editor.opt $(BINDIR)/graph-editor.opt
--	cp -f $(VIEWER_CMX) "$(DESTDIR)$(OCAMLLIB)"
--	cp -f $(DGRAPH_CMX) "$(DESTDIR)$(OCAMLLIB)"
--	cp -f $(DGRAPH_DIR)/dgraph.opt $(BINDIR)/graph-viewer.opt
-+	cp -f $(ED_DIR)/editor.opt $(BINDIR)/ocamlgraph-editor.opt
-+	cp -f $(VIEWER_CMX) $(VIEWER_OFILES) "$(DESTDIR)$(OCAMLLIB)"
-+	cp -f $(DGRAPH_CMX) $(DGRAPH_OFILES) "$(DESTDIR)$(OCAMLLIB)"
-+	cp -f $(DGRAPH_DIR)/dgraph.opt $(BINDIR)/ocamlgraph-viewer.opt
- endif
- 
- install-findlib: META
- ifdef OCAMLFIND
- ifeq (@LABLGNOMECANVAS@,yes)
- 	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
--		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
--		$(VIEWER_CMX) $(VIEWER_CMO) $(DGRAPH_CMX) $(DGRAPH_CMO)
-+		dgraph/*.mli dgraph/viewer.ml dgraph/dGraphViewer.ml \
-+		view_graph/*.mli view_graph/viewGraph_test.ml
- else
--	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
--		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
-+	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli
- endif
- endif
- 
+ 	mkdir -p $(BINDIR)
+ 	cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte

-- 
ocamlgraph packaging