merged 3.10.0 branch with trunk/

diff --cc debian/TODO.Debian
index 0000000000000000000000000000000000000000,75af9f8a4e3ca93e1d2a7ec34d00d344e2733d12..647d568d2d8561e6c8fd26c3098f10c93d4f2ac1
mode 000000,100644..100644
--- /dev/null
--- 2/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@@ -1,0 -1,29 +1,28 @@@
 -- merge with trunk/
+ TODO list for ocaml 3.10.0 (and beyond ...)
+ - lintian warnings
+   lintian /home/srv/debian/pkg-ocaml-maint/packages/ocaml/build-area/ocaml_3.10.0-1_i386.changes
+   W: ocaml source: substvar-source-version-is-deprecated ocaml-nox
+   W: ocaml source: substvar-source-version-is-deprecated ocaml
+   W: ocaml source: substvar-source-version-is-deprecated ocaml-native-compilers
+   W: ocaml-nox: binary-without-manpage usr/bin/camlp4
+   W: ocaml-nox: binary-without-manpage usr/bin/camlp4boot
+   W: ocaml-nox: binary-without-manpage usr/bin/camlp4o
+   W: ocaml-nox: binary-without-manpage usr/bin/camlp4of
+   W: ocaml-nox: binary-without-manpage usr/bin/camlp4oof
+   W: ocaml-nox: binary-without-manpage usr/bin/camlp4orf
+   W: ocaml-nox: binary-without-manpage usr/bin/camlp4prof
+   W: ocaml-nox: binary-without-manpage usr/bin/camlp4r
+   W: ocaml-nox: binary-without-manpage usr/bin/camlp4rf
+   W: ocaml-nox: binary-without-manpage usr/bin/mkcamlp4
+   W: ocaml-nox: binary-without-manpage usr/bin/ocamlbuild.byte
+   W: ocaml-nox: binary-without-manpage usr/bin/ocamlbuild.native
+   W: ocaml-nox: script-not-executable ./usr/lib/ocaml/3.10.0/camlheader
+   W: ocaml-native-compilers: binary-without-manpage usr/bin/camlp4of.opt
+   W: ocaml-native-compilers: binary-without-manpage usr/bin/camlp4oof.opt
+   W: ocaml-native-compilers: binary-without-manpage usr/bin/camlp4orf.opt
+   W: ocaml-native-compilers: binary-without-manpage usr/bin/camlp4rf.opt
+   W: ocaml-mode: binary-without-manpage usr/bin/ocamltags
+   E: ocaml-compiler-libs: copyright-should-refer-to-common-license-file-for-gpl
+   W: ocaml-base-nox: binary-without-manpage usr/bin/ocaml-md5sums
+   W: ocaml: binary-without-manpage usr/bin/labltk
+   W: ocaml: binary-without-manpage usr/bin/ocamlbrowser

diff --cc debian/cdbs/ocaml-vars.mk
index 5c1fb9cdf0e370cecd60f8662c8574e7ca1979fb,c333d6e4fdf59258241373eb255754ca1f01a7fa..7edf5369cb14ded7f7e8c2b4b3be97d9a9e0bc84
--- 1/debian/cdbs/ocaml-vars.mk
--- 2/debian/cdbs/ocaml-vars.mk
+++ b/debian/cdbs/ocaml-vars.mk
@@@ -16,7 -16,7 +16,7 @@@
  # this program; if not, write to the Free Software Foundation, Inc., 51
  # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  #
- # $Id: ocaml-vars.mk 3440 2007-01-02 18:38:11Z zack $
 -# $Id: ocaml-vars.mk 3667 2007-04-11 09:26:43Z zack $
++# $Id: ocaml-vars.mk 3830 2007-06-14 19:42:34Z zack $
  
  _cdbs_scripts_path ?= /usr/lib/cdbs
  _cdbs_rules_path ?= /usr/share/cdbs/1/rules

diff --cc debian/changelog
index 6184ac8f2ec75fd1e3651e3b5f90efda756f65ee,60f3b0e49ac4e12f877ffbc28e9df490d8296eb3..4911b6410f3b9454b8db6bd1fa621ad011c4fa58
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,29 +1,32 @@@
- ocaml (3.09.3-2) UNRELEASED; urgency=low
+ ocaml (3.10.0-2) UNRELEASED; urgency=low
+ 
 -  * NOT RELEASED YET
++  * Policy
++    - update the Vcs-Svn info to the latest PTS documentation
++    - describe dependencies from a -dev package to its companion shared stub
++      package (if any) and suggest the usage of ${binary:Version}
+ 
 - -- Stefano Zacchiroli <zack@debian.org>  Wed, 13 Jun 2007 18:12:26 +0200
++ -- Stefano Zacchiroli <zack@debian.org>  Thu, 14 Jun 2007 20:40:44 +0100
+ 
+ ocaml (3.10.0-1) experimental; urgency=low
+ 
+   [ Stefano Zacchiroli ]
+   * New upstream (stable) release
+   * debian/patches/*
+     - removed: ocaml-interp_manpage, build_wo_debug_info (integrated upstream)
+     - updated: install_ocamlbuild
+   * ship ocaml-compiler-libs objects as STDLIB/ocaml-compiler-libs/{parsing/,
+     typing/, utils/} rather than as a flat dir tree
+   * re-enabled ocaml-source package (which ships
+     /usr/src/ocaml-3.10.0.tar.bz2), now with a better way to generate it:
+     everything in the build dir except debian/ will be copied in the resulting
+     tarball
+   * debian/ocaml-source.exclude
+     - new file: list of tar exclude patterns, matching file won't be shipped
+       in the ocaml source tarball
+ 
+  -- Stefano Zacchiroli <zack@debian.org>  Wed, 13 Jun 2007 17:19:10 +0200
+ 
+ ocaml (3.10.0~beta-1) experimental; urgency=low
  
    [ Samuel Mimram ]
    * Ship dh_ocaml into ocaml-nox