Use debhelper more thoroughly

5 files changed, 6 insertions, 13 deletions

diff --git a/debian/coq-theories.install.in b/debian/coq-theories.install.in
index 482e5c6c..956a04f3 100644
--- a/debian/coq-theories.install.in
+++ b/debian/coq-theories.install.in
@@ -1 +1,2 @@
+doc/stdlib/html usr/share/doc/coq-theories/
 # *.vo files will be added here
diff --git a/debian/coq.dirs.in b/debian/coq.dirs.in
deleted file mode 100644
index 5c2ef467..00000000
--- a/debian/coq.dirs.in
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin
-usr/lib/coq/contrib/micromega
-usr/share/coq
-usr/share/man/man1
-usr/share/pixmaps
-usr/share/texmf/tex/latex/misc
-@OCamlDllDir@
diff --git a/debian/coq.install.in b/debian/coq.install.in
index 4e9eb49a..ba265336 100644
--- a/debian/coq.install.in
+++ b/debian/coq.install.in
@@ -25,4 +25,6 @@ usr/share/man/man1/coqtop*
 usr/share/man/man1/coqwc*
 usr/share/man/man1/gallina*
 usr/lib/coq/dllcoqrun.so @OCamlDllDir@
-usr/share/emacs/site-lisp/coqdoc.sty usr/share/texmf/tex/latex/misc/
+usr/share/emacs/site-lisp/coqdoc.sty    usr/share/texmf/tex/latex/misc/
+debian/coq.xpm                          usr/share/pixmaps
+debian/coqvars.mk                       usr/share/coq
diff --git a/debian/coqide.install b/debian/coqide.install
index 52eec4db..fc5b80fe 100644
--- a/debian/coqide.install
+++ b/debian/coqide.install
@@ -3,3 +3,4 @@ usr/lib/coq/ide/coq.png
 usr/lib/coq/ide/.coqide-gtk2rc
 usr/lib/coq/ide/FAQ
 usr/share/man/man1/coqide*
+debian/coqide.desktop    usr/share/applications
diff --git a/debian/rules b/debian/rules
index 997f99fe..12e6d874 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ HTMLDOC := doc/stdlib/html/index.html
 COQPREF := $(CURDIR)/debian/tmp
 ADDPREF := COQINSTALLPREFIX=$(COQPREF)
 
-PACKAGES := $(shell awk '/Package:/{print $$2}' debian/control)
+PACKAGES := $(shell dh_listpackages)
 
 COQ_VERSION := $(shell head -n1 debian/changelog | awk -F'[+() ]' '{print $$3}')
 COQ_ABI := $(COQ_VERSION)+$(OCAML_ABI)
@@ -71,11 +71,7 @@ install-stamp: build-stamp
 	find debian/tmp -name '*.vo' -printf '%P\n' \
 	  >> debian/coq-theories.install
 	dh_install --list-missing
-	cp debian/coq.xpm debian/coq/usr/share/pixmaps
 	cp debian/coq.xpm debian/coqide/usr/share/pixmaps/coqide.xpm
-	cp debian/coqide.desktop debian/coqide/usr/share/applications
-	cp -r doc/stdlib/html debian/coq-theories/usr/share/doc/coq-theories/
-	cp debian/coqvars.mk debian/coq/usr/share/coq/
 	$(DH) install --after dh_install
 	for u in $(PACKAGES); do \
 	  echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \