Update packaging

diff --git a/debian/dispatch.ml b/debian/dispatch.ml
index 7ed0dcfc705cab09d2589e453c4cd3931c8fc4c0..5689acfbd9a219b7cea48fc01cca73fd2180b465 100644 (file)
--- 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 dd2b95c617a40c21917b0c49b0ebf5962c4123d8..61354caf1ff056cffe9ffeeb618822c085bf4a44 100644 (file)
--- 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 07045dfd21c5d314d8bd0b24d5b87f818e1d7e85..a8f51def2bda7d27a81e1dc0d8dcb446a56a7872 100644 (file)
--- 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 71624bef62d7f6d8f52156e1bd6e0e56d08409eb..15bb8b61f7218836f5d638b5d3f89e1ecc4ba6af 100755 (executable)
--- 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