[Pkg-ocaml-maint-commits] r2159 - in trunk/packages/findlib/trunk/debian: . patches

[Stefano Zacchiroli]

Author: zack
Date: 2005-11-27 11:53:15 +0000 (Sun, 27 Nov 2005)
New Revision: 2159

Modified:
   trunk/packages/findlib/trunk/debian/changelog
   trunk/packages/findlib/trunk/debian/patches/23_include.dpatch
   trunk/packages/findlib/trunk/debian/rules
Log:
bugfix: fixes use of additional configuration files


Modified: trunk/packages/findlib/trunk/debian/changelog
===================================================================
--- trunk/packages/findlib/trunk/debian/changelog	2005-11-27 11:11:19 UTC (rev 2158)
+++ trunk/packages/findlib/trunk/debian/changelog	2005-11-27 11:53:15 UTC (rev 2159)
@@ -1,3 +1,12 @@
+findlib (1.1-5) UNRELEASED; urgency=low
+
+  * fixed upstream bugfix which inhibit sourcing of additional
+    configuration files. In Debian this broke the native compilers
+    settings inherited by the ocaml-native-compilers package
+  * avoid stripping <stdlib>/findlib/make_wizard on non-native archs
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 27 Nov 2005 12:52:55 +0100
+
 findlib (1.1-4) unstable; urgency=low
 
   * avoid stripping findlib executable on non-native archs, fixes FTBFS

Modified: trunk/packages/findlib/trunk/debian/patches/23_include.dpatch
===================================================================
--- trunk/packages/findlib/trunk/debian/patches/23_include.dpatch	2005-11-27 11:11:19 UTC (rev 2158)
+++ trunk/packages/findlib/trunk/debian/patches/23_include.dpatch	2005-11-27 11:53:15 UTC (rev 2159)
@@ -5,18 +5,32 @@
 ## DP: No description.
 
 @DPATCH@
+diff -urNad trunk~/src/findlib/findlib_config.mlp trunk/src/findlib/findlib_config.mlp
+--- trunk~/src/findlib/findlib_config.mlp	2005-11-01 01:36:35.000000000 +0100
++++ trunk/src/findlib/findlib_config.mlp	2005-11-27 12:47:09.000000000 +0100
+@@ -4,6 +4,7 @@
+  *)
+ 
+ let config_file = "@CONFIGFILE@";;
++let extra_configd_file = "/usr/share/ocaml-findlib/";; (* Debian specific *)
+ 
+ let ocaml_stdlib = "@STDLIB@";;
+ 
 diff -urNad trunk~/src/findlib/findlib.ml trunk/src/findlib/findlib.ml
---- trunk~/src/findlib/findlib.ml	2005-11-08 20:21:43.000000000 +0000
-+++ trunk/src/findlib/findlib.ml	2005-11-08 20:24:22.000000000 +0000
-@@ -99,6 +99,8 @@
+--- trunk~/src/findlib/findlib.ml	2005-11-01 01:36:35.000000000 +0100
++++ trunk/src/findlib/findlib.ml	2005-11-27 12:47:43.000000000 +0100
+@@ -99,8 +99,10 @@
    let configd_file =
      config_file ^ ".d" in
  
 +  let extra_configd_file = Findlib_config.extra_configd_file in
 +
    let vars_of_file f =
-     let ch = open_in config_file in
+-    let ch = open_in config_file in
++    let ch = open_in f in     (* Debian specific: bug fix, sent upstream *)
      try
+       let vars = 
+ 	(Fl_metascanner.parse ch).Fl_metascanner.pkg_defs in
 @@ -136,12 +138,17 @@
  	  vars_of_file config_file
  	else
@@ -36,14 +50,3 @@
        if vars <> [] then (
  	let lookup name default =
  	  try Fl_metascanner.lookup name config_preds vars
-diff -urNad trunk~/src/findlib/findlib_config.mlp trunk/src/findlib/findlib_config.mlp
---- trunk~/src/findlib/findlib_config.mlp	2005-11-08 20:21:43.000000000 +0000
-+++ trunk/src/findlib/findlib_config.mlp	2005-11-08 20:21:43.000000000 +0000
-@@ -4,6 +4,7 @@
-  *)
- 
- let config_file = "@CONFIGFILE@";;
-+let extra_configd_file = "/usr/share/ocaml-findlib/";; (* Debian specific *)
- 
- let ocaml_stdlib = "@STDLIB@";;
- 

Modified: trunk/packages/findlib/trunk/debian/rules
===================================================================
--- trunk/packages/findlib/trunk/debian/rules	2005-11-27 11:11:19 UTC (rev 2158)
+++ trunk/packages/findlib/trunk/debian/rules	2005-11-27 11:53:15 UTC (rev 2159)
@@ -27,7 +27,8 @@
 build/$(PKGNAME)::
 	$(MAKE) opt
 else
-DEB_STRIP_EXCLUDE = usr/bin/ocamlfind
+DEB_STRIP_EXCLUDE += usr/bin/ocamlfind
+DEB_STRIP_EXCLUDE += $(OCAMLLIBDIR)/findlib/make_wizard
 endif
 install/$(PKGNAME)::
 	# rm ocamlc.opt and similar settings, they're not avail everywhere in debian