From: Stephane Glondu Date: Tue, 26 May 2009 16:55:01 +0000 (+0200) Subject: Backport ocamlbuild -where fix X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~409 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6e2dabf7727899fe1f0fd9ae23ffd49d975ac2f3;p=ocaml.git Backport ocamlbuild -where fix --- diff --git a/debian/changelog b/debian/changelog index 5e51b530..77ed813e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,9 @@ ocaml (3.11.1~rc0-1) UNRELEASED; urgency=low * New upstream release candidate: - remove dbm_ldopts.dpatch (merged upstream) - switch patch system to quilt + - add Backport-ocamlbuild-where-fix patch (from upstream) - -- Stephane Glondu Tue, 19 May 2009 17:41:47 +0200 + -- Stephane Glondu Tue, 26 May 2009 18:55:07 +0200 ocaml (3.11.0-5) unstable; urgency=low diff --git a/debian/patches/0008-Backport-ocamlbuild-where-fix.patch b/debian/patches/0008-Backport-ocamlbuild-where-fix.patch new file mode 100644 index 00000000..00b41770 --- /dev/null +++ b/debian/patches/0008-Backport-ocamlbuild-where-fix.patch @@ -0,0 +1,25 @@ +From: Stephane Glondu +Date: Tue, 26 May 2009 18:54:22 +0200 +Subject: [PATCH] Backport ocamlbuild -where fix + +--- + ocamlbuild/ocamlbuild_where.ml | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ocamlbuild/ocamlbuild_where.ml b/ocamlbuild/ocamlbuild_where.ml +index 1703a53..14fcde5 100644 +--- a/ocamlbuild/ocamlbuild_where.ml ++++ b/ocamlbuild/ocamlbuild_where.ml +@@ -1,5 +1,7 @@ + let bindir = ref Ocamlbuild_Myocamlbuild_config.bindir;; + let libdir = ref begin +- try Filename.concat (Sys.getenv "OCAMLLIB") "ocamlbuild" +- with Not_found -> Ocamlbuild_Myocamlbuild_config.libdir ++ Filename.concat ++ (try Sys.getenv "OCAMLLIB" ++ with Not_found -> Ocamlbuild_Myocamlbuild_config.libdir) ++ "ocamlbuild" + end;; +-- +1.6.2.4 + diff --git a/debian/patches/series b/debian/patches/series index d206397c..96d00d61 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch 0006-Patch-config.sh-for-installation.patch 0007-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch +0008-Backport-ocamlbuild-where-fix.patch