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

[Stefano Zacchiroli]

Author: zack
Date: 2005-11-27 22:01:37 +0000 (Sun, 27 Nov 2005)
New Revision: 2180

Modified:
   trunk/packages/findlib/trunk/debian/changelog
   trunk/packages/findlib/trunk/debian/patches/23_include.dpatch
Log:
findlib 1.1.1


Modified: trunk/packages/findlib/trunk/debian/changelog
===================================================================
--- trunk/packages/findlib/trunk/debian/changelog	2005-11-27 18:28:39 UTC (rev 2179)
+++ trunk/packages/findlib/trunk/debian/changelog	2005-11-27 22:01:37 UTC (rev 2180)
@@ -1,11 +1,12 @@
-findlib (1.1-5) UNRELEASED; urgency=low
+findlib (1.1.1-1) unstable; 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
+  * new upstream release
+    - integrated a patch of mine which fixes 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
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 27 Nov 2005 23:00:55 +0100
 
 findlib (1.1-4) unstable; urgency=low
 

Modified: trunk/packages/findlib/trunk/debian/patches/23_include.dpatch
===================================================================
--- trunk/packages/findlib/trunk/debian/patches/23_include.dpatch	2005-11-27 18:28:39 UTC (rev 2179)
+++ trunk/packages/findlib/trunk/debian/patches/23_include.dpatch	2005-11-27 22:01:37 UTC (rev 2180)
@@ -7,7 +7,7 @@
 @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
++++ trunk/src/findlib/findlib_config.mlp	2005-11-27 22:57:44.000000000 +0100
 @@ -4,6 +4,7 @@
   *)
  
@@ -18,19 +18,16 @@
  
 diff -urNad trunk~/src/findlib/findlib.ml trunk/src/findlib/findlib.ml
 --- 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 @@
++++ trunk/src/findlib/findlib.ml	2005-11-27 22:58:07.000000000 +0100
+@@ -99,6 +99,8 @@
    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 f in     (* Debian specific: bug fix, sent upstream *)
+     let ch = open_in config_file in
      try
-       let vars = 
- 	(Fl_metascanner.parse ch).Fl_metascanner.pkg_defs in
 @@ -136,12 +138,17 @@
  	  vars_of_file config_file
  	else