[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 1d5ee1e1597c600d69022f17b79919a863bf81ba
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 5 11:23:39 2012 +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 090d6d0..8d67103 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
@@ -11,7 +11,7 @@ Forwarded: not-needed
 Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
  findlib.conf.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/findlib.conf.in b/findlib.conf.in
 index 261d2c8..05f6c3d 100644
diff --git a/debian/patches/0002-Extra-configuration-search-path.patch b/debian/patches/0002-Extra-configuration-search-path.patch
index 6f80b50..f81e68a 100644
--- a/debian/patches/0002-Extra-configuration-search-path.patch
+++ b/debian/patches/0002-Extra-configuration-search-path.patch
@@ -10,13 +10,13 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
  src/findlib/findlib.ml         |    9 ++++++++-
  src/findlib/findlib_config.mlp |    1 +
- 2 files changed, 9 insertions(+), 1 deletions(-)
+ 2 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml
-index 28c86a0..8894ed6 100644
+index 8f99932..4f8fe9f 100644
 --- a/src/findlib/findlib.ml
 +++ b/src/findlib/findlib.ml
-@@ -106,6 +106,8 @@ let init
+@@ -108,6 +108,8 @@ let init
    let configd_file =
      config_file ^ ".d" in
  
@@ -25,7 +25,7 @@ index 28c86a0..8894ed6 100644
    let vars_of_file f =
      let ch = open_in f in
      try
-@@ -143,12 +145,17 @@ let init
+@@ -151,12 +153,17 @@ let init
  	  vars_of_file config_file
  	else
  	  [] in
@@ -42,8 +42,8 @@ index 28c86a0..8894ed6 100644
 -      let vars = config_vars @ configd_vars in
 +      let vars = config_vars @ configd_vars @ extra_configd_vars in
        if vars <> [] then (
+         let found = ref false in
  	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
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 f1c8f17..8bf41b3 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
@@ -6,7 +6,7 @@ Subject: META.num*: bugfix, moved "directory" directive outside "core"
 ---
  site-lib-src/num-top/META.in |    1 +
  site-lib-src/num/META.in     |    2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/site-lib-src/num-top/META.in b/site-lib-src/num-top/META.in
 index 184d65f..1b18b74 100644
diff --git a/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch
index 6e5dc32..a38056c 100644
--- a/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch
+++ b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch
@@ -4,14 +4,14 @@ Subject: Camlp4 depends on Dynlink on every architecture
 
 ---
  site-lib-src/camlp4.310/META.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/site-lib-src/camlp4.310/META.in b/site-lib-src/camlp4.310/META.in
-index 637d848..a490ab1 100644
+index 6666abd..1bd6fc2 100644
 --- a/site-lib-src/camlp4.310/META.in
 +++ b/site-lib-src/camlp4.310/META.in
 @@ -6,7 +6,7 @@ dnl This file is input of the m4 macro processor.
- `directory = "'camlp4_dir`"'
+ `directory = "+camlp4"'
  
  `# For the toploop:'
 -`requires(byte,toploop) = "'camlp4_dynlink`"'
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 4ce9e6c..38b0447 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
@@ -4,10 +4,10 @@ Subject: Do not use an absolute path in META.camlp4
 
 ---
  configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index bdb3379..d2bf393 100755
+index 52199b6..fc803a0 100755
 --- a/configure
 +++ b/configure
 @@ -416,7 +416,7 @@ fi
diff --git a/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch b/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch
index 93e3b93..888c47b 100644
--- a/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch
+++ b/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch
@@ -5,7 +5,7 @@ Subject: Disable graphics and labltk when unavailable
 ---
  site-lib-src/graphics/META.in |    1 +
  site-lib-src/labltk/META.in   |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ 2 files changed, 2 insertions(+)
 
 diff --git a/site-lib-src/graphics/META.in b/site-lib-src/graphics/META.in
 index 7fd5ec2..eacac66 100644

-- 
findlib packaging