[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.6+debian-1-2-gf4496cb

[Romain Beauxis]

The following commit has been merged in the master branch:
commit f4496cb0703477e2f3378b35af011cefed5a8170
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Apr 4 20:11:17 2011 -0500

    Allow to override debian-specific configuration in
    findlib's main configuration file..

diff --git a/debian/changelog b/debian/changelog
index ff50d0c..35c3cdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+findlib (1.2.6+debian-2) unstable; urgency=low
+
+  * Updated 0002-Extra-configuration-search-path.patch
+    to allow overriding Debian-specific configuration 
+    variables in findlib's main configuration.
+    This issue appear when using for instance mingw32-ocaml
+    where the main configuration file changed but Debian-specific
+    settings override it.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 04 Apr 2011 20:06:47 -0500
+
 findlib (1.2.6+debian-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/0002-Extra-configuration-search-path.patch b/debian/patches/0002-Extra-configuration-search-path.patch
index f103d30..486ca3f 100644
--- a/debian/patches/0002-Extra-configuration-search-path.patch
+++ b/debian/patches/0002-Extra-configuration-search-path.patch
@@ -12,11 +12,11 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  src/findlib/findlib_config.mlp |    1 +
  2 files changed, 9 insertions(+), 1 deletions(-)
 
-diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml
-index b8dbdc5..bdaefee 100644
---- a/src/findlib/findlib.ml
-+++ b/src/findlib/findlib.ml
-@@ -103,6 +103,8 @@ let init
+Index: findlib/src/findlib/findlib.ml
+===================================================================
+--- findlib.orig/src/findlib/findlib.ml	2011-04-04 19:58:12.000000000 -0500
++++ findlib/src/findlib/findlib.ml	2011-04-04 20:06:33.000000000 -0500
+@@ -103,6 +103,8 @@
    let configd_file =
      config_file ^ ".d" in
  
@@ -25,7 +25,7 @@ index b8dbdc5..bdaefee 100644
    let vars_of_file f =
      let ch = open_in f in
      try
-@@ -140,12 +142,17 @@ let init
+@@ -140,12 +142,17 @@
  	  vars_of_file config_file
  	else
  	  [] in
@@ -40,14 +40,14 @@ index b8dbdc5..bdaefee 100644
  	else
  	  [] in
 -      let vars = config_vars @ configd_vars in
-+      let vars = extra_configd_vars @ config_vars @ configd_vars in
++      let vars = config_vars @ configd_vars @ extra_configd_vars in
        if vars <> [] then (
  	let lookup name default =
  	  try Fl_metascanner.lookup name config_preds vars
-diff --git a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp
-index 5b4ab69..09d0089 100644
---- a/src/findlib/findlib_config.mlp
-+++ b/src/findlib/findlib_config.mlp
+Index: findlib/src/findlib/findlib_config.mlp
+===================================================================
+--- findlib.orig/src/findlib/findlib_config.mlp	2011-04-04 19:58:12.000000000 -0500
++++ findlib/src/findlib/findlib_config.mlp	2011-04-04 20:04:07.000000000 -0500
 @@ -4,6 +4,7 @@
   *)
  
@@ -56,4 +56,3 @@ index 5b4ab69..09d0089 100644
  
  let ocaml_stdlib = "@STDLIB@";;
  
--- 

-- 
findlib packaging