Miscellaneous updates

6 files changed, 7 insertions, 10 deletions

diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 7c32f559..00000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-install
diff --git a/debian/coqide.dirs b/debian/coqide.dirs
index bf32ae9c..c1da623a 100644
--- a/debian/coqide.dirs
+++ b/debian/coqide.dirs
@@ -1,5 +1 @@
-usr/lib/coq/ide
-usr/share/doc/coqide
-usr/share/applications
-usr/share/man/man1
 usr/share/pixmaps
diff --git a/debian/coqide.docs b/debian/coqide.docs
deleted file mode 100644
index 6fcc323e..00000000
--- a/debian/coqide.docs
+++ /dev/null
@@ -1 +0,0 @@
-ide/FAQ
diff --git a/debian/coqide.install b/debian/coqide.install
index fc5b80fe..4336ff03 100644
--- a/debian/coqide.install
+++ b/debian/coqide.install
@@ -1,6 +1,6 @@
 usr/bin/coqide*
-usr/lib/coq/ide/coq.png
-usr/lib/coq/ide/.coqide-gtk2rc
-usr/lib/coq/ide/FAQ
+usr/share/coq/coq.png
+etc/xdg/coq/coqide-gtk2rc
+usr/share/doc/coq/FAQ-CoqIde usr/share/doc/coqide
 usr/share/man/man1/coqide*
 debian/coqide.desktop    usr/share/applications
diff --git a/debian/libcoq-ocaml.install.in b/debian/libcoq-ocaml.install.in
index 746a3577..9459116f 100644
--- a/debian/libcoq-ocaml.install.in
+++ b/debian/libcoq-ocaml.install.in
@@ -22,6 +22,7 @@ usr/lib/coq/plugins/rtauto/rtauto_plugin.cma
 usr/lib/coq/plugins/setoid_ring/newring_plugin.cma
 usr/lib/coq/plugins/micromega/micromega_plugin.cma
 usr/lib/coq/plugins/quote/quote_plugin.cma
+usr/lib/coq/plugins/decl_mode/decl_mode_plugin.cma
 DYN: usr/lib/coq/plugins/ring/ring_plugin.cmxs
 DYN: usr/lib/coq/plugins/fourier/fourier_plugin.cmxs
 DYN: usr/lib/coq/plugins/extraction/extraction_plugin.cmxs
@@ -45,3 +46,4 @@ DYN: usr/lib/coq/plugins/rtauto/rtauto_plugin.cmxs
 DYN: usr/lib/coq/plugins/setoid_ring/newring_plugin.cmxs
 DYN: usr/lib/coq/plugins/micromega/micromega_plugin.cmxs
 DYN: usr/lib/coq/plugins/quote/quote_plugin.cmxs
+DYN: usr/lib/coq/plugins/decl_mode/decl_mode_plugin.cma
diff --git a/debian/rules b/debian/rules
index a364ad70..379cb28f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,10 +22,11 @@ ADDPREF := COQINSTALLPREFIX=$(COQPREF) OLDROOT=
 
 PACKAGES := $(shell dh_listpackages)
 
-COQ_VERSION := 8.3pl3
+COQ_VERSION := 8.4beta
 COQ_ABI := $(COQ_VERSION)+$(OCAML_ABI)
 
 CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \
+  --configdir /etc/xdg/coq \
   --emacslib /usr/share/emacs/site-lisp/coq \
   --browser "/usr/bin/x-www-browser %s &" \
   --with-doc no --coqrunbyteflags "-dllib -lcoqrun"