From: Andy Li <andy@onthewings.net>
Date: Tue, 14 Jan 2020 10:51:30 +0000 (+0800)
Subject: Merge branch 'debian/sid' into uchar
X-Git-Tag: archive/raspbian/4.08.1-7+rpi1^2~10^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=45de93439187eb30deb043d468643dbb969f6406;p=ocaml.git

Merge branch 'debian/sid' into uchar

# Conflicts:
#	debian/rules
---

45de93439187eb30deb043d468643dbb969f6406
diff --cc debian/rules
index 48d9ebb7,8e0258b4..2480bc8d
--- a/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))