[Pkg-ocaml-maint-commits] r1071 - in packages/ocamlgraph/trunk/debian: . patches

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-03-23 22:35:09 +0000 (Wed, 23 Mar 2005)
New Revision: 1071

Added:
   packages/ocamlgraph/trunk/debian/patches/03_META.dpatch
Modified:
   packages/ocamlgraph/trunk/debian/changelog
   packages/ocamlgraph/trunk/debian/control
   packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs
   packages/ocamlgraph/trunk/debian/patches/00list
   packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch
Log:
Transition to ocaml 3.08.3 and some few bugfixes -- SLG


Modified: packages/ocamlgraph/trunk/debian/changelog
===================================================================
--- packages/ocamlgraph/trunk/debian/changelog	2005-03-23 22:14:53 UTC (rev 1070)
+++ packages/ocamlgraph/trunk/debian/changelog	2005-03-23 22:35:09 UTC (rev 1071)
@@ -1,3 +1,11 @@
+ocamlgraph (0.90-2) unstable; urgency=medium
+
+  * Transition to ocaml 3.08.3 : depends on ocaml-nox-3.08.3
+  * Patch 03_META use graph.cma and graph.cmxa ( Closes: #294806 )
+  * Correct the patch 01_makefile to install graph.a ( Closes: #289138 )
+
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org>  Wed, 23 Mar 2005 23:17:46 +0100
+
 ocamlgraph (0.90-1) unstable; urgency=low
 
   * New upstream version

Modified: packages/ocamlgraph/trunk/debian/control
===================================================================
--- packages/ocamlgraph/trunk/debian/control	2005-03-23 22:14:53 UTC (rev 1070)
+++ packages/ocamlgraph/trunk/debian/control	2005-03-23 22:35:09 UTC (rev 1071)
@@ -2,13 +2,13 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall@polytechnique.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08, dpatch (>= 1.11), ocamlweb, ocaml-findlib
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, dpatch (>= 1.11), ocamlweb, ocaml-findlib
 Standards-Version: 3.6.1.1
 
 Package: libocamlgraph-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-3.08
+Depends: ocaml-nox-3.08.3
 Suggests: graphviz | springgraph
 Description: graph library for OCaml
  Ocamlgraph is a graph library for OCaml. Provides the following

Modified: packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs
===================================================================
--- packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs	2005-03-23 22:14:53 UTC (rev 1070)
+++ packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs	2005-03-23 22:35:09 UTC (rev 1071)
@@ -1 +1 @@
-/usr/lib/ocaml/3.08
+/usr/lib/ocaml/3.08.3

Modified: packages/ocamlgraph/trunk/debian/patches/00list
===================================================================
--- packages/ocamlgraph/trunk/debian/patches/00list	2005-03-23 22:14:53 UTC (rev 1070)
+++ packages/ocamlgraph/trunk/debian/patches/00list	2005-03-23 22:35:09 UTC (rev 1071)
@@ -1 +1,2 @@
 01_makefile
+03_META

Modified: packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch
===================================================================
--- packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch	2005-03-23 22:14:53 UTC (rev 1070)
+++ packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch	2005-03-23 22:35:09 UTC (rev 1071)
@@ -44,13 +44,13 @@
 -	$(OCAMLFIND) install ocamlgraph META *.mli \
 -		graph.a graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
 +	$(OCAMLFIND) install $(if $(DESTDIR),-destdir $(DESTDIR)) \
-+		ocamlgraph META *.mli graph.o graph.cmi $(CMA) $(CMXA)
++		ocamlgraph META *.mli graph.a graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
 +endif
 + 
 +install-findlib-byte: META
 +ifdef OCAMLFIND
 +	$(OCAMLFIND) install $(if $(DESTDIR),-destdir $(DESTDIR)) \
-+		ocamlgraph META *.mli graph.cmi $(CMA)
++		ocamlgraph META *.mli graph.cmi graph.cmo $(CMA)
  endif
  
  # documentation

Added: packages/ocamlgraph/trunk/debian/patches/03_META.dpatch
===================================================================
--- packages/ocamlgraph/trunk/debian/patches/03_META.dpatch	2005-03-23 22:14:53 UTC (rev 1070)
+++ packages/ocamlgraph/trunk/debian/patches/03_META.dpatch	2005-03-23 22:35:09 UTC (rev 1071)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_META.dpatch by Sylvain Le Gall <sylvain.le-gall@polytechnique.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad ocamlgraph-0.90/META.in /tmp/dpep.VC8gGg/ocamlgraph-0.90/META.in
+--- ocamlgraph-0.90/META.in	2004-11-30 16:32:09.000000000 +0100
++++ /tmp/dpep.VC8gGg/ocamlgraph-0.90/META.in	2005-03-23 23:26:27.000000000 +0100
+@@ -1,5 +1,5 @@
+ version = "VERSION"
+ description = "Generic Graph Library"
+ requires=""
+-archive(byte) = "graph.cmo"
+-archive(native) = "graph.cmx"
++archive(byte) = "graph.cma"
++archive(native) = "graph.cmxa"


Property changes on: packages/ocamlgraph/trunk/debian/patches/03_META.dpatch
___________________________________________________________________
Name: svn:executable
   + *