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

[Nicolas Dandrimont]

The following commit has been merged in the master branch:
commit bcfc0148219a6b9b22b06167f91c04e4e0b5fb1f
Author: Nicolas Dandrimont <nicolas.dandrimont at crans.org>
Date:   Mon Jun 27 21:40:00 2011 +0200

    Refresh patches

diff --git a/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch b/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch
index 8b1a522..090d6d0 100644
--- a/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch
+++ b/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch
@@ -1,6 +1,6 @@
 From: Stefano Zacchiroli <zack at debian.org>
 Date: Sat, 12 Feb 2011 10:17:31 +0100
-Subject: [PATCH] Change standard directories to conform our own policy
+Subject: Change standard directories to conform our own policy
 
 Patch upstream findlib.conf.in so that:
  - default "manual" installation dir is /usr/local/lib/ocaml/<version>
diff --git a/debian/patches/0002-Extra-configuration-search-path.patch b/debian/patches/0002-Extra-configuration-search-path.patch
index 486ca3f..7a5e351 100644
--- a/debian/patches/0002-Extra-configuration-search-path.patch
+++ b/debian/patches/0002-Extra-configuration-search-path.patch
@@ -1,6 +1,6 @@
 From: Stefano Zacchiroli <zack at debian.org>
 Date: Sat, 12 Feb 2011 10:21:40 +0100
-Subject: [PATCH] Extra configuration search path
+Subject: Extra configuration search path
 
 Support for an extra, debian-specific, dir where to look for
 configuration file snippets (namely /usr/share/ocaml-findlib/).
@@ -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(-)
 
-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 @@
+diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml
+index b8dbdc5..828544b 100644
+--- a/src/findlib/findlib.ml
++++ b/src/findlib/findlib.ml
+@@ -103,6 +103,8 @@ let init
    let configd_file =
      config_file ^ ".d" in
  
@@ -25,7 +25,7 @@ Index: findlib/src/findlib/findlib.ml
    let vars_of_file f =
      let ch = open_in f in
      try
-@@ -140,12 +142,17 @@
+@@ -140,12 +142,17 @@ let init
  	  vars_of_file config_file
  	else
  	  [] in
@@ -44,10 +44,10 @@ Index: findlib/src/findlib/findlib.ml
        if vars <> [] then (
  	let lookup name default =
  	  try Fl_metascanner.lookup name config_preds vars
-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
+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
 @@ -4,6 +4,7 @@
   *)
  
@@ -56,3 +56,4 @@ Index: findlib/src/findlib/findlib_config.mlp
  
  let ocaml_stdlib = "@STDLIB@";;
  
+-- 
diff --git a/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch b/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch
index 0e17081..f1c8f17 100644
--- a/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch
+++ b/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch
@@ -1,6 +1,7 @@
 From: Stefano Zacchiroli <zack at debian.org>
 Date: Sat, 12 Feb 2011 10:23:55 +0100
-Subject: [PATCH] META.num*: bugfix, moved "directory" directive outside "core" subpackage
+Subject: META.num*: bugfix, moved "directory" directive outside "core"
+ subpackage
 
 ---
  site-lib-src/num-top/META.in |    1 +

-- 
findlib packaging