[Pkg-ocaml-maint-commits] r1732 - in trunk/packages/ocaml/trunk/debian: . ocamlfind

[Stefano Zacchiroli]

Author: zack
Date: 2005-09-02 23:05:44 +0000 (Fri, 02 Sep 2005)
New Revision: 1732

Added:
   trunk/packages/ocaml/trunk/debian/ocamlfind/
   trunk/packages/ocaml/trunk/debian/ocamlfind/ocaml-native-compilers.conf
Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.dirs
   trunk/packages/ocaml/trunk/debian/rules
Log:
ship ocaml-native-compilers.conf to configure findlib to use native compilers


Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2005-09-02 18:43:37 UTC (rev 1731)
+++ trunk/packages/ocaml/trunk/debian/changelog	2005-09-02 23:05:44 UTC (rev 1732)
@@ -1,10 +1,5 @@
 ocaml (3.08.3-8) UNRELEASED; urgency=low
 
-  Changes by Stefano Zacchiroli:
-  * debian/rules
-    - remove spurious CVS directories from labltk examples
-      (Closes: Bug#322712)
-  
   Changes by Jérôme Marant:
   * Create a new `ocaml-mode' package dedicated at Emacs-related files
   * debian/control:
@@ -39,6 +34,15 @@
     - New files
   * debian/rules: Update ocaml-md5sum files location accordingly
   
+  Changes by Stefano Zacchiroli:
+  * debian/rules
+    - remove spurious CVS directories from labltk examples
+      (Closes: Bug#322712)
+  * debian/ocamlfind/ocaml-native-compilers.conf
+    - gets installed under /usr/share/ocaml-findlib/ so that, if
+      ocamlfind is available, compiling with findlib will use the
+      native compilers
+  
  -- Jerome Marant <jerome at debian.org>  Sat, 20 Aug 2005 13:34:52 +0200
 
 ocaml (3.08.3-7) unstable; urgency=low

Modified: trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.dirs
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.dirs	2005-09-02 18:43:37 UTC (rev 1731)
+++ trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.dirs	2005-09-02 23:05:44 UTC (rev 1732)
@@ -1,2 +1,3 @@
 usr/bin
 usr/share/man/man1
+usr/share/ocaml-findlib

Added: trunk/packages/ocaml/trunk/debian/ocamlfind/ocaml-native-compilers.conf
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocamlfind/ocaml-native-compilers.conf	2005-09-02 18:43:37 UTC (rev 1731)
+++ trunk/packages/ocaml/trunk/debian/ocamlfind/ocaml-native-compilers.conf	2005-09-02 23:05:44 UTC (rev 1732)
@@ -0,0 +1,2 @@
+ocamlc="ocamlc.opt"
+ocamlopt="ocamlopt.opt"

Modified: trunk/packages/ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml/trunk/debian/rules	2005-09-02 18:43:37 UTC (rev 1731)
+++ trunk/packages/ocaml/trunk/debian/rules	2005-09-02 23:05:44 UTC (rev 1732)
@@ -176,6 +176,8 @@
 	if [ -e opt-built-stamp ]; then					\
 		dh_movefiles -pocaml-native-compilers			\
 			--sourcedir=debian/ocaml-nox;			\
+		cp debian/ocamlfind/ocaml-native-compilers.conf		\
+			debian/ocaml-native-compilers/usr/share/ocaml-findlib/;	\
 	fi
 
 	# The interpreter files