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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit bdd4088d1f1391675545dc35d85269fddc275fe7
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Sat Jul 4 21:52:51 2009 +0200

    Update patch 01_makefile

diff --git a/debian/changelog b/debian/changelog
index 8d3094d..a1cc31d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ocamlgraph (1.1-1) unstable; urgency=low
   * New Upstream Version
   * Update some build-dependencies versions
   * Upgrade Standards-Version to 3.8.2, no changes needed.
+  * Update patch 01_makefile
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Wed, 24 Jun 2009 13:07:24 +0200
 
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch
index 2d32b3b..939b86a 100755
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.dpatch
@@ -1,20 +1,19 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile.dpatch by Stefano Zacchiroli <zack at debian.org>
+## 01_makefile.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: make ocamlfind install target choose the "best"
 
 @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 18:13:16.000000000 +0200
+--- ocamlgraph~/Makefile.in	2009-07-04 23:02:52.000000000 +0200
++++ ocamlgraph/Makefile.in	2009-07-04 23:03:29.000000000 +0200
 @@ -143,10 +143,13 @@
  
  viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST)
  
--VIEWER_CMO=viewGraph viewGraph_select
 +ifeq (@LABLGNOMECANVAS@,yes)
-+VIEWER_CMO=viewGraph viewGraph_select viewGraph_test
+ VIEWER_CMO=viewGraph viewGraph_select viewGraph_utils viewGraph_test
  VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO))
 +endif
  VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx)
@@ -23,7 +22,7 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
  
  VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I .
  
-@@ -240,44 +243,43 @@
+@@ -240,42 +243,16 @@
  
  DESTDIR	=
  
@@ -53,14 +52,10 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
 -	cp -f $(VIEWER_CMX) "$(DESTDIR)$(OCAMLLIB)"
 -	cp -f $(VIEWER_DIR)/viewgraph.opt $(BINDIR)/graph-viewer.opt
 -endif
-+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 graph.o $(CMXA) $(VIEWER_CMX) $(VIEWER_OFILES) "$(DESTDIR)$(OCAMLLIB)"
-+endif 
- 
+-
 -install-findlib: META
  ifdef OCAMLFIND
+-ifeq (@LABLGNOMECANVAS@,yes)
 +install-findlib: META install-bin
 +ifeq ($(OCAMLBEST),opt)
  	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
@@ -68,14 +63,15 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
 -		$(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 \
+ else
+ 	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
+-		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
 +		graph.cmo graph.cmi $(CMA) \
 +		$(VIEWER_CMO) $(VIEWER_CMI)
-+endif
+ endif
  endif
  
- META: META.in Makefile
+@@ -283,6 +260,20 @@
  	sed -e s/VERSION/$(VERSION)/ -e s/CMA/$(CMA)/ -e s/CMXA/$(CMXA)/ \
  		$@.in > $@
  

-- 
ocamlgraph packaging