From e3feda556f747c85c81027081b65a797d5a93ce4 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 11 Jul 2019 13:40:58 +0200 Subject: [PATCH] Fix broken doc symlinks (Closes: #877267) --- debian/MANIFEST | 3 +-- ...l-base-nox.README.Debian => OCaml_for_Debian} | 16 ++++++++++++++++ debian/README.Debian | 15 --------------- debian/ocaml-base-nox.docs | 1 + debian/rules | 9 ++------- 5 files changed, 20 insertions(+), 24 deletions(-) rename debian/{ocaml-base-nox.README.Debian => OCaml_for_Debian} (77%) delete mode 100644 debian/README.Debian diff --git a/debian/MANIFEST b/debian/MANIFEST index 35f86190..7198450a 100644 --- a/debian/MANIFEST +++ b/debian/MANIFEST @@ -1,5 +1,5 @@ debian/MANIFEST -debian/README.Debian +debian/OCaml_for_Debian debian/README.source debian/TODO.Debian debian/changelog @@ -15,7 +15,6 @@ debian/man/ocamldumpobj.1 debian/man/ocamlmklib.1 debian/man/ocamlobjinfo.1 debian/native-archs -debian/ocaml-base-nox.README.Debian debian/ocaml-base-nox.dirs.in debian/ocaml-base-nox.docs debian/ocaml-base-nox.install.in diff --git a/debian/ocaml-base-nox.README.Debian b/debian/OCaml_for_Debian similarity index 77% rename from debian/ocaml-base-nox.README.Debian rename to debian/OCaml_for_Debian index cda8aafe..67213a3f 100644 --- a/debian/ocaml-base-nox.README.Debian +++ b/debian/OCaml_for_Debian @@ -52,3 +52,19 @@ In order to be able to compile ocamldoc generated LaTeX sources you will need to install the "texlive-latex-extra" package. -- Stefano Zacchiroli Sun, 02 Sep 2007 18:22:14 +0200 + +Debug information produced by ocamlc +==================================== + +In upstream OCaml, “ocamlc -custom” produces executables that cannot +be stripped (more precisely, the bytecode, which is not part of the +ELF data, is removed by strip). This Debian version is patched (and +the patch has been rejected by upstream [1], but is available +separately in debian/patches) so that the bytecode is embedded in the +executable and can be stripped. This new behaviour is optional, and +can be enabled by setting the OCAML_CUSTOM_EMBED environment variable +to “y”. + +[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=49;bug=256900 + + -- Stéphane Glondu , Tue, 26 Jun 2012 07:27:05 +0200 diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 7a63ebce..00000000 --- a/debian/README.Debian +++ /dev/null @@ -1,15 +0,0 @@ -OCaml Debian package -==================== - -In upstream OCaml, “ocamlc -custom” produces executables that cannot -be stripped (more precisely, the bytecode, which is not part of the -ELF data, is removed by strip). This Debian version is patched (and -the patch has been rejected by upstream [1], but is available -separately in debian/patches) so that the bytecode is embedded in the -executable and can be stripped. This new behaviour is optional, and -can be enabled by setting the OCAML_CUSTOM_EMBED environment variable -to “y”. - -[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=49;bug=256900 - - -- Stéphane Glondu , Tue, 26 Jun 2012 07:27:05 +0200 diff --git a/debian/ocaml-base-nox.docs b/debian/ocaml-base-nox.docs index 52e22424..dd2b95c6 100644 --- a/debian/ocaml-base-nox.docs +++ b/debian/ocaml-base-nox.docs @@ -1 +1,2 @@ +debian/OCaml_for_Debian README.adoc diff --git a/debian/rules b/debian/rules index ebd129ee..718a4e60 100755 --- a/debian/rules +++ b/debian/rules @@ -206,12 +206,6 @@ endif cp tools/$$u debian/ocaml-nox/usr/bin/ocaml$$u; \ fi \ done - set -e; for pkg in ocaml ocaml-nox ocaml-base; do ( \ - mkdir -p debian/$$pkg/usr/share/doc/$$pkg && \ - cd debian/$$pkg/usr/share/doc/$$pkg && \ - ln -sf ../ocaml-base-nox/README.gz . && \ - ln -sf ../ocaml-base-nox/README.Debian .; \ - ); done endif # Remaining stuff touch $@ @@ -269,7 +263,8 @@ endif .PHONY: override_dh_installdocs override_dh_installdocs: - dh_installdocs --ignore debian/README.Debian + dh_installdocs --package=ocaml-base-nox --doc-main-package=ocaml + dh_installdocs --remaining-packages .PHONY: override_dh_missing override_dh_missing: -- 2.30.2