[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.7+debian-1-11-gdf5e005

[Stephane Glondu]

The following commit has been merged in the master branch:
commit e155bc34457f3f77e4bce2a7d9d09f9aad1908b4
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Feb 28 08:40:19 2012 +0100

    Refresh patches

diff --git a/debian/patches/0002-Extra-configuration-search-path.patch b/debian/patches/0002-Extra-configuration-search-path.patch
index 7a5e351..6f80b50 100644
--- a/debian/patches/0002-Extra-configuration-search-path.patch
+++ b/debian/patches/0002-Extra-configuration-search-path.patch
@@ -13,10 +13,10 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  2 files changed, 9 insertions(+), 1 deletions(-)
 
 diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml
-index b8dbdc5..828544b 100644
+index 28c86a0..8894ed6 100644
 --- a/src/findlib/findlib.ml
 +++ b/src/findlib/findlib.ml
-@@ -103,6 +103,8 @@ let init
+@@ -106,6 +106,8 @@ let init
    let configd_file =
      config_file ^ ".d" in
  
@@ -25,7 +25,7 @@ index b8dbdc5..828544b 100644
    let vars_of_file f =
      let ch = open_in f in
      try
-@@ -140,12 +142,17 @@ let init
+@@ -143,12 +145,17 @@ let init
  	  vars_of_file config_file
  	else
  	  [] in
diff --git a/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch
index 08e0824..4ce9e6c 100644
--- a/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch
+++ b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch
@@ -7,15 +7,15 @@ Subject: Do not use an absolute path in META.camlp4
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index e82ecc1..a896c35 100755
+index bdb3379..d2bf393 100755
 --- a/configure
 +++ b/configure
 @@ -416,7 +416,7 @@ fi
  # Check on camlp4:
  
  if in_path camlp4; then
--    camlp4_dir=`camlp4 -where`
-+    camlp4_dir=`camlp4 -where | sed -s 's@/usr/lib/ocaml/@^@'`
+-    camlp4_dir=`camlp4 -where | tr -d '\015'`
++    camlp4_dir=`camlp4 -where | tr -d '\015' | sed -s 's@/usr/lib/ocaml/@^@'`
      if [ ${use_cygpath} -gt 0 ]; then
  	camlp4_dir=`echo x | env USE_CYGPATH=1 tools/patch x "$camlp4_dir"`
          # This makes camlp4_dir a windows path

-- 
findlib packaging