From: Stéphane Glondu <glondu@debian.org>
Date: Mon, 18 Sep 2023 11:40:16 +0000 (+0200)
Subject: Update packaging
X-Git-Tag: archive/raspbian/4.14.1-1+rpi1^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9f54afe553e1a995dbb917f27d2b5a07260fbb6d;p=ocaml.git

Update packaging
---

diff --git a/debian/dispatch.ml b/debian/dispatch.ml
index 7ed0dcfc..5689acfb 100644
--- a/debian/dispatch.ml
+++ b/debian/dispatch.ml
@@ -204,6 +204,8 @@ let process_file x =
 
 let remaining =
   installed_files
+  |> move_all_to ocaml ((=) "usr/share/doc/ocaml/Changes")
+  |> move_all_to ocaml ((=) "usr/share/doc/ocaml/README.adoc")
   |> move_all_to ocaml (String.starts_with ~prefix:"usr/lib/ocaml/caml/")
   |> move_all_to dev_stdlib (String.starts_with ~prefix:"usr/lib/ocaml/threads/")
   |> move_all_to dev_stdlib (String.starts_with ~prefix:"usr/lib/ocaml/std_exit.")
diff --git a/debian/ocaml-base-nox.docs b/debian/ocaml-base-nox.docs
index dd2b95c6..61354caf 100644
--- a/debian/ocaml-base-nox.docs
+++ b/debian/ocaml-base-nox.docs
@@ -1,2 +1 @@
 debian/OCaml_for_Debian
-README.adoc
diff --git a/debian/ocamlvars.mk b/debian/ocamlvars.mk
index 07045dfd..a8f51def 100644
--- a/debian/ocamlvars.mk
+++ b/debian/ocamlvars.mk
@@ -1,6 +1,6 @@
 include /usr/share/dpkg/architecture.mk
 
-OCAMLMAJOR := 4.13
+OCAMLMAJOR := 4.14
 OCAMLMINOR := 1
 
 OCAML_ABI := $(OCAMLMAJOR).$(OCAMLMINOR)
diff --git a/debian/rules b/debian/rules
index 71624bef..15bb8b61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -232,6 +232,10 @@ ifeq ($(OCAML_HAVE_OCAMLOPT),no)
 	  $(INSTDIR)/bin/ocamloptp.* \
 	  $(INSTDIR)/bin/ocamloptp
 endif
+# Remove irrelevant files
+	rm -f \
+	  $(INSTDIR)/share/doc/ocaml/README.win32.adoc \
+	  $(INSTDIR)/share/doc/ocaml/LICENSE
 # Dispatch files with dh_install
 	find debian/tmp \( -type f -or -type l \) -printf '%P\n' > debian/installed-files
 	boot/ocamlrun ./ocaml -nostdlib -I debian/tmp/usr/lib/ocaml debian/dispatch.ml