[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.2.pl1+dfsg-6-12-g7a99898

[Stephane Glondu]

The following commit has been merged in the master branch:
commit ca93c2ad1dedd8266ffe02104842dcecc38e425b
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jun 3 12:06:17 2010 +0200

    Use dh with overrides

diff --git a/debian/control b/debian/control
index 1c1d7e1..3542f0e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders:
  Stéphane Glondu <glondu at debian.org>
 Standards-Version: 3.8.4
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 7.2.11~),
  dh-ocaml (>= 0.9~),
  ocaml-nox (>= 3.11.1-3~),
  ocaml-best-compilers,
diff --git a/debian/rules b/debian/rules
index 12e6d87..5a7363f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,18 +35,15 @@ export OCAMLINIT_SED += \
   -e 's%@CoqVersion@%$(COQ_VERSION)%' \
   -e 's%@CoqABI@%$(COQ_ABI)%'
 
-DH := dh --with ocaml
+%:
+	+dh --with ocaml $@
 
-configure: configure-stamp
-configure-stamp:
-	$(DH) build --before dh_auto_configure
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
 	./configure $(CONFIGUREOPTS)
-	touch $@
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
 
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 ifeq ($(BUILDCACHE),)
 
 # VALIDOPTS are the options given to coqchk; the value given here is
@@ -58,35 +55,29 @@ ifeq ($(BUILDCACHE),)
 else
 	rsync -a --exclude=debian --exclude=.git $(BUILDCACHE)/ .
 endif
-	$(DH) build --after dh_auto_test
-	touch $@
 
-install: install-stamp
-install-stamp: build-stamp
-	$(DH) install --before dh_auto_install
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+# TODO: run make check here instead of in override_dh_auto_build (?)
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 	$(MAKE) $(ADDPREF) install
 	find debian/tmp -regextype posix-awk \
 	  -regex '.*\.(cm[aoxi]|cmxa|[ao])$$' \
 	  >> debian/libcoq-ocaml-dev.install
 	find debian/tmp -name '*.vo' -printf '%P\n' \
 	  >> debian/coq-theories.install
+
+.PHONY: override_dh_install
+override_dh_install:
 	dh_install --list-missing
 	cp debian/coq.xpm debian/coqide/usr/share/pixmaps/coqide.xpm
-	$(DH) install --after dh_install
+
+.PHONY: override_dh_gencontrol
+override_dh_gencontrol:
 	for u in $(PACKAGES); do \
 	  echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \
 	  echo 'F:CoqABI=$(COQ_ABI)' >> debian/$$u.substvars; \
 	done
-	touch $@
-
-clean:
-	$(DH) $@
-
-binary-indep: install-stamp
-	$(DH) $@
-
-binary-arch: install-stamp
-	$(DH) $@
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+	dh_gencontrol

-- 
coq packaging