From 5a641c3f2d46146bb0f6c7d586c2e56b10e0d61e Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Sun, 3 Feb 2019 15:57:45 -0500 Subject: Update to new toploop packaging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As of 8.9, upstream has stopped distributing plugins that turn coqtop into worker processes for CoqIDE and other things. There are now separate binaries for each coqtop use case. Ensure they’re all distributed. --- debian/coq.install.in | 1 + debian/libcoq-ocaml.install.in | 6 ------ debian/not-installed | 1 + debian/rules | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/debian/coq.install.in b/debian/coq.install.in index 8bc58451..d5fe3367 100644 --- a/debian/coq.install.in +++ b/debian/coq.install.in @@ -1,4 +1,5 @@ #!/usr/bin/dh-exec +usr/bin/coq*worker* usr/bin/coqc* usr/bin/coqdep* usr/bin/coqdoc* diff --git a/debian/libcoq-ocaml.install.in b/debian/libcoq-ocaml.install.in index c89a0e53..16f20bb5 100644 --- a/debian/libcoq-ocaml.install.in +++ b/debian/libcoq-ocaml.install.in @@ -21,12 +21,6 @@ usr/lib/coq/plugins/syntax/nat_syntax_plugin.cmo usr/lib/coq/plugins/syntax/ascii_syntax_plugin.cmo usr/lib/coq/plugins/syntax/string_syntax_plugin.cmo usr/lib/coq/plugins/syntax/z_syntax_plugin.cmo -usr/lib/coq/toploop/proofworkertop.cma -usr/lib/coq/toploop/tacworkertop.cma -usr/lib/coq/toploop/queryworkertop.cma -DYN: usr/lib/coq/toploop/proofworkertop.cmxs -DYN: usr/lib/coq/toploop/tacworkertop.cmxs -DYN: usr/lib/coq/toploop/queryworkertop.cmxs DYN: usr/lib/coq/plugins/rtauto/rtauto_plugin.cmxs DYN: usr/lib/coq/plugins/extraction/extraction_plugin.cmxs DYN: usr/lib/coq/plugins/cc/cc_plugin.cmxs diff --git a/debian/not-installed b/debian/not-installed index 8bc34b46..2c21e3ab 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,4 +1,5 @@ # CoqIDE is temporarily disabled. +usr/bin/coqidetop* usr/share/man/man1/coqide.1 usr/lib/coq/toploop/coqidetop.cmxs diff --git a/debian/rules b/debian/rules index 5083fdf8..0aa899e8 100755 --- a/debian/rules +++ b/debian/rules @@ -91,7 +91,7 @@ override_dh_auto_install: $(MAKE) $(ADDPREF) install install-byte find debian/tmp -regextype posix-awk \ -regex '.*\.(cmi|cmx|cmxa|[ao])$$' \ - | grep -v toploop/ | grep -v coq-native \ + | grep -v coq-native \ >> debian/libcoq-ocaml-dev.install find debian/tmp -name '*.vo' -printf '%P\n' \ >> debian/coq-theories.install @@ -104,7 +104,6 @@ override_dh_auto_install: .PHONY: override_dh_install override_dh_install: - chmod a-x debian/tmp/usr/lib/coq/toploop/*cma chmod +x debian/coq.install dh_install --fail-missing -- cgit v1.2.3