-ocaml (3.11.1~rc0-1) UNRELEASED; urgency=low
+ocaml (3.11.1~rc1-1) UNRELEASED; urgency=low
[ Samuel Mimram ]
* Add kfreebsd-amd64 to the list of supported native architectures.
[ Stephane Glondu ]
* New upstream release candidate:
- remove dbm_ldopts.dpatch (merged upstream)
+ - remove ocamldoc_natdynlink.dpatch (merged upstream)
- switch patch system to quilt
- - add Backport-ocamlbuild-where-fix patch (from upstream)
- -- Stephane Glondu <steph@glondu.net> Tue, 26 May 2009 18:55:07 +0200
+ -- Stephane Glondu <steph@glondu.net> Wed, 03 Jun 2009 13:16:25 +0200
ocaml (3.11.0-5) unstable; urgency=low
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
-index e736a92..9028530 100755
+index 166ceaf..0327f64 100755
--- a/configure
+++ b/configure
@@ -282,7 +282,8 @@ case "$bytecc,$host" in
amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
--
-1.6.2.4
-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
-index 9028530..156c72a 100755
+index 0327f64..1d0d767 100755
--- a/configure
+++ b/configure
-@@ -1560,7 +1560,7 @@ echo "DEBUGGER=$debugger" >> Makefile
+@@ -1566,7 +1566,7 @@ echo "DEBUGGER=$debugger" >> Makefile
echo "CC_PROFILE=$cc_profile" >> Makefile
echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
echo "PARTIALLD=$partialld" >> Makefile
echo "IFLEXDIR=$iflexdir" >> Makefile
echo "O=o" >> Makefile
--
-1.6.2.4
-
String.length s >= String.length pref &&
String.sub s 0 (String.length pref) = pref
--
-1.6.2.4
-
autotest_stdlib: dummy
--
-1.6.2.4
-
+++ /dev/null
-From: Stefano Zacchiroli <zack@debian.org>
-Date: Tue, 19 May 2009 17:25:59 +0200
-Subject: [PATCH] Add to ocamldoc support for native code dynamic loading
-
-That enables using ocamldoc flags such as "-g" also with
-ocamldoc.opt. Patch is taken from OCaml CVS and is already
-integrated upstream for future releases.
----
- man/ocamldoc.m | 5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
-
-diff --git a/man/ocamldoc.m b/man/ocamldoc.m
-index 5d1ed6a..757ec58 100644
---- a/man/ocamldoc.m
-+++ b/man/ocamldoc.m
-@@ -110,10 +110,7 @@ to display it.
- .TP
- .BI \-g \ file
- Dynamically load the given file (which extension usually is .cmo or .cma),
--which defines a custom documentation generator. This option is supported by the
--.BR ocamldoc (1)
--command, but not by its native-code version
--.BR ocamldoc.opt .
-+which defines a custom documentation generator.
- If the given file is a simple one and does not exist in
- the current directory, then ocamldoc looks for it in the custom
- generators default directory, and in the directories specified with the
---
-1.6.2.4
-
--- /dev/null
+From: Ralf Treinen <treinen@debian.org>
+Date: Tue, 19 May 2009 17:28:09 +0200
+Subject: [PATCH] Patch config.sh for installation
+
+Use for installatation a patched config.sh (created by debian/rules).
+---
+ build/install.sh | 2 +-
+ build/partial-install.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/install.sh b/build/install.sh
+index 34d6384..c57bcdb 100755
+--- a/build/install.sh
++++ b/build/install.sh
+@@ -18,7 +18,7 @@ set -e
+
+ cd `dirname $0`/..
+
+-. config/config.sh
++. config/config.debian.install.sh
+
+ not_installed=$PWD/_build/not_installed
+
+diff --git a/build/partial-install.sh b/build/partial-install.sh
+index 7240fff..ea55334 100755
+--- a/build/partial-install.sh
++++ b/build/partial-install.sh
+@@ -22,7 +22,7 @@ set -e
+
+ cd `dirname $0`/..
+
+-. config/config.sh
++. config/config.debian.install.sh
+
+ not_installed=$PWD/_build/not_installed
+
+--
--- /dev/null
+From: Stefano Zacchiroli <zack@debian.org>
+Date: Tue, 19 May 2009 17:28:56 +0200
+Subject: [PATCH] Install ocamlbuild as a link on either .native or .byte
+
+---
+ build/partial-install.sh | 17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/build/partial-install.sh b/build/partial-install.sh
+index ea55334..a0a0028 100755
+--- a/build/partial-install.sh
++++ b/build/partial-install.sh
+@@ -60,6 +60,21 @@ installbestbin() {
+ [ -x "$3" ] || chmod +x "$3"
+ }
+
++installbestlink() {
++ if [ -f "$1" ]; then
++ echo " linking binary $3 to `basename $1`"
++ ln -fs "$1" "$3"
++ else
++ if [ -f "$2" ]; then
++ echo " linking binary $3 to `basename $2`"
++ ln -fs "$2" "$3"
++ else
++ echo "None of $1, $2 exists"
++ exit 3
++ fi
++ fi
++}
++
+ installlib() {
+ if [ -f "$1" ]; then
+ dest="$2/`basename $1`"
+@@ -156,7 +171,7 @@ echo "Installing ocamlbuild..."
+ cd ocamlbuild
+ installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE
+ installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE
+-installbestbin ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
++installbestlink ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
+
+ installlibdir \
+ ocamlbuildlib.$A \
+--
+++ /dev/null
-From: Ralf Treinen <treinen@debian.org>
-Date: Tue, 19 May 2009 17:28:09 +0200
-Subject: [PATCH] Patch config.sh for installation
-
-Use for installatation a patched config.sh (created by debian/rules).
----
- build/install.sh | 2 +-
- build/partial-install.sh | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/install.sh b/build/install.sh
-index 34d6384..c57bcdb 100755
---- a/build/install.sh
-+++ b/build/install.sh
-@@ -18,7 +18,7 @@ set -e
-
- cd `dirname $0`/..
-
--. config/config.sh
-+. config/config.debian.install.sh
-
- not_installed=$PWD/_build/not_installed
-
-diff --git a/build/partial-install.sh b/build/partial-install.sh
-index 7240fff..ea55334 100755
---- a/build/partial-install.sh
-+++ b/build/partial-install.sh
-@@ -22,7 +22,7 @@ set -e
-
- cd `dirname $0`/..
-
--. config/config.sh
-+. config/config.debian.install.sh
-
- not_installed=$PWD/_build/not_installed
-
---
-1.6.2.4
-
+++ /dev/null
-From: Stefano Zacchiroli <zack@debian.org>
-Date: Tue, 19 May 2009 17:28:56 +0200
-Subject: [PATCH] Install ocamlbuild as a link on either .native or .byte
-
----
- build/partial-install.sh | 17 ++++++++++++++++-
- 1 files changed, 16 insertions(+), 1 deletions(-)
-
-diff --git a/build/partial-install.sh b/build/partial-install.sh
-index ea55334..a0a0028 100755
---- a/build/partial-install.sh
-+++ b/build/partial-install.sh
-@@ -60,6 +60,21 @@ installbestbin() {
- [ -x "$3" ] || chmod +x "$3"
- }
-
-+installbestlink() {
-+ if [ -f "$1" ]; then
-+ echo " linking binary $3 to `basename $1`"
-+ ln -fs "$1" "$3"
-+ else
-+ if [ -f "$2" ]; then
-+ echo " linking binary $3 to `basename $2`"
-+ ln -fs "$2" "$3"
-+ else
-+ echo "None of $1, $2 exists"
-+ exit 3
-+ fi
-+ fi
-+}
-+
- installlib() {
- if [ -f "$1" ]; then
- dest="$2/`basename $1`"
-@@ -156,7 +171,7 @@ echo "Installing ocamlbuild..."
- cd ocamlbuild
- installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE
- installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE
--installbestbin ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
-+installbestlink ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
-
- installlibdir \
- ocamlbuildlib.$A \
---
-1.6.2.4
-
+++ /dev/null
-From: Stephane Glondu <steph@glondu.net>
-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
-
0002-Call-ld-with-proper-flags.patch
0003-Don-t-use-rpath.patch
0004-Put-manpages-in-section-3o-instead-of-3.patch
-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
+0005-Patch-config.sh-for-installation.patch
+0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
projects / ocaml.git / commitdiff