Merge branch 'master' into experimental/master

Conflicts:
	debian/changelog
	debian/rules

diff --cc debian/changelog
index a8af4dca6367c1c1cfbfc1017a780da5a29c23a7,d00cb129b50c36dd693472b2ec4bde9fcfb34aa3..50f44d5fa1ced0ce96438b356b0159aef28ab38b
--- 1/debian/changelog
--- 2/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 <gildor@debian.org>  Fri, 21 Sep 2012 01:20:13 +0000
+   [ 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.
+ 
 + -- Stéphane Glondu <glondu@debian.org>  Wed, 14 Nov 2012 13:07:19 +0100
 +
 +ocaml (4.00.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Stéphane Glondu <glondu@debian.org>  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 <glondu@debian.org>  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 <glondu@debian.org>  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 <glondu@debian.org>  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 <glondu@debian.org>  Thu, 19 Apr 2012 09:04:28 +0200
  
  ocaml (3.12.1-4) unstable; urgency=low
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
index 82cef0bb9495f1e63b6c21465a86f44525c5964b,a29a23a321a0d8ec4498ee794e234e5ac3d952ef..d7dffd856a9626341d546447227f65f724a0e21f
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -59,10 -55,11 +60,11 @@@ export OCAML_OPT_ARC
  export OCAML_STDLIB_DIR
  
  CONFIGURE_OPTS := \
 -  --with-pthread -prefix /usr \
 -  -libdir $(OCAML_STDLIB_DIR) \
+   --host $(DEB_BUILD_GNU_TYPE)\
 +  --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"