From: Stephane Glondu Date: Wed, 3 Jun 2009 11:14:39 +0000 (+0200) Subject: New upstream release candidate, update patches X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~407 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=72115cfdcc64124457df76b5747aaa45af8cf328;p=ocaml.git New upstream release candidate, update patches --- diff --git a/debian/changelog b/debian/changelog index 77ed813e..c2daba06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -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. @@ -15,10 +15,10 @@ ocaml (3.11.1~rc0-1) UNRELEASED; urgency=low [ 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 Tue, 26 May 2009 18:55:07 +0200 + -- Stephane Glondu Wed, 03 Jun 2009 13:16:25 +0200 ocaml (3.11.0-5) unstable; urgency=low diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch index ef231d00..0ab6e424 100644 --- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch +++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch @@ -9,7 +9,7 @@ code (bug#338437) 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 @@ -31,5 +31,3 @@ index e736a92..9028530 100755 amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";; -- -1.6.2.4 - diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch index 6635dbdc..c88102f7 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -10,10 +10,10 @@ gcc. 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 @@ -23,5 +23,3 @@ index 9028530..156c72a 100755 echo "IFLEXDIR=$iflexdir" >> Makefile echo "O=o" >> Makefile -- -1.6.2.4 - diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch index f6611e68..11bfba43 100644 --- a/debian/patches/0003-Don-t-use-rpath.patch +++ b/debian/patches/0003-Don-t-use-rpath.patch @@ -23,5 +23,3 @@ index cec4877..4db288f 100644 String.length s >= String.length pref && String.sub s 0 (String.length pref) = pref -- -1.6.2.4 - diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch index 7b991881..19aaa0d8 100644 --- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch +++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch @@ -20,5 +20,3 @@ index 66f9fdd..45476ec 100644 autotest_stdlib: dummy -- -1.6.2.4 - diff --git a/debian/patches/0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch b/debian/patches/0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch deleted file mode 100644 index 9403dd4b..00000000 --- a/debian/patches/0005-Add-to-ocamldoc-support-for-native-code-dynamic-load.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Stefano Zacchiroli -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 - diff --git a/debian/patches/0005-Patch-config.sh-for-installation.patch b/debian/patches/0005-Patch-config.sh-for-installation.patch new file mode 100644 index 00000000..75c0e518 --- /dev/null +++ b/debian/patches/0005-Patch-config.sh-for-installation.patch @@ -0,0 +1,37 @@ +From: Ralf Treinen +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 + +-- diff --git a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch new file mode 100644 index 00000000..e20fa972 --- /dev/null +++ b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch @@ -0,0 +1,44 @@ +From: Stefano Zacchiroli +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 \ +-- diff --git a/debian/patches/0006-Patch-config.sh-for-installation.patch b/debian/patches/0006-Patch-config.sh-for-installation.patch deleted file mode 100644 index db2e87e8..00000000 --- a/debian/patches/0006-Patch-config.sh-for-installation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Ralf Treinen -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 - diff --git a/debian/patches/0007-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch b/debian/patches/0007-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch deleted file mode 100644 index 0fc5ce15..00000000 --- a/debian/patches/0007-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Stefano Zacchiroli -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 - diff --git a/debian/patches/0008-Backport-ocamlbuild-where-fix.patch b/debian/patches/0008-Backport-ocamlbuild-where-fix.patch deleted file mode 100644 index 00b41770..00000000 --- a/debian/patches/0008-Backport-ocamlbuild-where-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 96d00d61..e66568a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,5 @@ 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