[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.1.9.deb-1-18-g96329a6

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit 8a6cba72be03e91e676b91ce47639426b9ac8727
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Tue Jan 19 23:05:41 2010 +0100

    Use dh overrides in debian/rules

diff --git a/debian/changelog b/debian/changelog
index 561f508..5a5d68d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ coccinelle (0.2.0.deb-1) unstable; urgency=low
     - system-menhir.diff
     - system-ocamlsexp.diff
     - system-pycaml.diff
+  * Use dh overrides in debian/rules
 
- -- Євгеній Мещеряков <eugen at debian.org>  Tue, 19 Jan 2010 22:45:35 +0100
+ -- Євгеній Мещеряков <eugen at debian.org>  Tue, 19 Jan 2010 23:04:38 +0100
 
 coccinelle (0.1.10.deb-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9f1686b..9ab39bb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Євгеній Мещеряков <eugen at debian.org>
-Build-Depends: debhelper (>= 7), ocaml-nox (>= 3.11.0), pycaml (>= 0.82-10), python,
+Build-Depends: debhelper (>= 7.0.50~), ocaml-nox (>= 3.11.0), pycaml (>= 0.82-10), python,
  menhir (>= 20090204.dfsg), libmenhir-ocaml-dev (>= 20090204.dfsg), ocaml-findlib, dh-ocaml,
  ocaml-best-compilers, python2.5-dev, python-support (>= 0.6), libsexplib-camlp4-dev
 Standards-Version: 3.8.3
diff --git a/debian/rules b/debian/rules
index 7b56628..db92277 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,21 +22,20 @@ CONFIG_FLAGS = $(COMMON_CONFIG) --no-opt
 MAKE_TGT = all
 endif
 
-build: build-stamp
-build-stamp:
-	dh build --before dh_auto_configure
+build clean binary binary-arch binary-indep install:
+	dh $@
+
+override_dh_auto_configure:
 	./configure $(CONFIG_FLAGS)
+
+override_dh_auto_build:
 	$(MAKE) $(COCCI_FLAGS) depend
 	$(MAKE) $(COCCI_FLAGS) $(MAKE_TGT)
-	dh build --after dh_auto_test
-	touch build-stamp
 
-clean:
-	dh clean
+override_dh_auto_test:
+	# Nothing
 
-install: install-stamp
-install-stamp: build-stamp
-	dh install --before dh_auto_install
+override_dh_auto_install:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/coccinelle $(COCCI_FLAGS) install
 	# install the wrapper script, i dont like upstreams one
 	rm $(CURDIR)/debian/coccinelle/usr/bin/spatch*
@@ -55,19 +54,12 @@ install-stamp: build-stamp
 	# Emacs files
 	cp $(CURDIR)/editors/emacs/cocci.el $(CURDIR)/debian/coccinelle/usr/share/emacs/site-lisp/
 
-	dh install --after dh_auto_install --before dh_compress
+override_dh_compress:
 	dh_compress -X.pdf
-	dh install --after dh_compress
-	touch install-stamp
-
 
-binary-arch: install
-	dh binary-arch --before dh_gencontrol
+override_dh_gencontrol:
 	dh_gencontrol -a -- -VF:OCamlRun="$(OCAMLRUN)"
-	dh binary-arch --after dh_gencontrol
-
-binary-indep: install
-
-binary: binary-indep binary-arch
 
 .PHONY: build clean binary-indep binary-arch binary install
+.PHONY: override_dh_auto_configure override_dh_auto_build override_dh_auto_test override_dh_auto_install
+.PHONY: verride_dh_compress override_dh_gencontrol

-- 
Debian packaging for coccinelle