Merge branch 'debian/sid' into uchar

# Conflicts:
#	debian/rules

diff --cc debian/rules
index 48d9ebb77d0f8e5780431d072ef3438cde07f974,8e0258b43281386727ef34e4c1ee6e7f8f45bfb5..2480bc8d9a955980be465c73d3e5fbe0583dfb85
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -183,10 -183,24 +183,27 @@@ endi
  override_dh_auto_install-arch: install-stamp-arch
  override_dh_auto_install-indep: install-stamp-indep
  
- install-stamp-indep:
+ install-stamp-indep: install-stamp
        touch $@
  
- install-stamp-arch:
+ install-stamp-arch: install-stamp
+ # Install additional files not handled by dh_install
+ # Beware: dh_install does not handle renamings, please pay attention
+       set -e; for u in dumpobj; do \
+         if [ -f tools/$$u ]; then \
+           cp tools/$$u debian/ocaml-nox/usr/bin/ocaml$$u; \
+         fi \
+       done
+ # Install the seq compatibility package (OCaml >= 4.07)
+       mkdir -p debian/ocaml-base-nox$(OCAML_STDLIB_DIR)/seq
+       cp debian/META.seq debian/ocaml-base-nox$(OCAML_STDLIB_DIR)/seq/META
++# Install the uchar compatibility package (OCaml >= 4.03)
++      mkdir -p debian/ocaml-base-nox$(OCAML_STDLIB_DIR)/uchar
++      cp debian/META.uchar debian/ocaml-base-nox$(OCAML_STDLIB_DIR)/uchar/META
+ # Remaining stuff
+       touch $@
+ 
+ install-stamp:
  # Install OCaml
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
  ifeq (,$(DEB_TEST_BUILD_PREFIX))