From: Stephane Glondu Date: Wed, 14 Nov 2012 12:10:43 +0000 (+0100) Subject: Merge branch 'master' into experimental/master X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~213 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f76e0cd31a5cac2d24738d7e1f9911582e9f94ad;p=ocaml.git Merge branch 'master' into experimental/master Conflicts: debian/changelog debian/rules --- f76e0cd31a5cac2d24738d7e1f9911582e9f94ad diff --cc debian/changelog index a8af4dca,d00cb129..50f44d5f --- a/debian/changelog +++ b/debian/changelog @@@ -1,66 -1,13 +1,74 @@@ -ocaml (3.12.1-5) UNRELEASED; urgency=low +ocaml (4.00.1-1) UNRELEASED; urgency=low + ++ [ Stéphane Glondu ] + * New upstream release + [ Sylvain Le Gall ] + * Remove Sylvain Le Gall from uploaders + + [ Mehdi Dogguy ] + * Use DEB_BUILD_GNU_TYPE instead of relying on "uname -m" (Closes: #689517). + Thanks to Konstantinos Margaritis for the patch. + - -- Sylvain Le Gall Fri, 21 Sep 2012 01:20:13 +0000 + -- Stéphane Glondu Wed, 14 Nov 2012 13:07:19 +0100 + +ocaml (4.00.0-1) experimental; urgency=low + + * New upstream release + + -- Stéphane Glondu Fri, 27 Jul 2012 07:30:10 +0200 + +ocaml (4.00.0~rc1-1) experimental; urgency=low + + * New upstream release candidate + - fix linking of pthread_atfork (Closes: #682441) + * Merge changes from 3.12.1-4 + + -- Stéphane Glondu Sat, 21 Jul 2012 15:42:10 +0200 + +ocaml (4.00.0~beta2-2) experimental; urgency=low + + * Fix natdynlink detection on sparc + * Cherry-pick an upstream fix in native compilation on powerpc + * Fixes in the test suite: + - use legacy -custom for lib-marshal test + - some tests were still triggering ocamlopt even on bytecode + - fix asmcomp tests on powerpc + - fix symbol mangling in asmcomp tests on kfreebsd-i386 and sparc + * Bump Standards-Version to 3.9.3 + + -- Stéphane Glondu Thu, 21 Jun 2012 16:42:25 +0200 + +ocaml (4.00.0~beta2-1) experimental; urgency=low + + * New upstream beta release + - new "R" parameter in OCAMLRUNPARAMS to enable automatic + randomization of the generic hash function (Closes: #659149, + CVE-2012-0839) + - the layout of the ocaml-compiler-libs binary package has changed + significantly as a result of upstream installing +compiler-libs by + itself; toplevel libraries have been moved there + * Change the layout of the ocaml-source binary package + * Merge changes from version 3.12.1-3 + + -- Stéphane Glondu Wed, 13 Jun 2012 22:38:41 +0200 + +ocaml (4.00.0~~dev15+12379-1) experimental; urgency=low + + * New upstream snapshot, based on the 4.00 upstream branch + - partially revert r12328 to avoid FTBFS + - the dbm bindings have been removed upstream and are now released + separately + - declare armel and armhf as native architectures supporting + natdynlink + * Run the test-suite + - on kfreebsd-*, skip lib-thread tests (they hang and I am not able + to reproduce it myself) + - on slow architectures, skip some tests that take too much time + - fix asmcomp tests on Hurd (Closes: #661716) + - fix "embedded" test broken by our -custom behaviour + + -- Stéphane Glondu Thu, 19 Apr 2012 09:04:28 +0200 ocaml (3.12.1-4) unstable; urgency=low diff --cc debian/rules index 82cef0bb,a29a23a3..d7dffd85 --- a/debian/rules +++ b/debian/rules @@@ -59,10 -55,11 +60,11 @@@ export OCAML_OPT_ARC export OCAML_STDLIB_DIR CONFIGURE_OPTS := \ + --host $(DEB_BUILD_GNU_TYPE)\ - --with-pthread -prefix /usr \ - -libdir $(OCAML_STDLIB_DIR) \ + --with-pthread -prefix $(DEB_TEST_BUILD_PREFIX)/usr \ + -libdir $(DEB_TEST_BUILD_PREFIX)$(OCAML_STDLIB_DIR) \ -x11lib "$(shell pkg-config --variable=libdir x11)" \ - -mandir /usr/share/man \ + -mandir $(DEB_TEST_BUILD_PREFIX)/usr/share/man \ -tkdefs "-I/usr/include/tcl8.5" \ -tklibs "-L/usr/lib -ltk8.5 -ltcl8.5"