[Pkg-ocaml-maint-commits] [SCM] cduce packaging branch, master, updated. debian/0.5.3-2-9-g9453bae

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 389235c6ae967615c8ab667174a03b1151c4157d
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Oct 6 14:52:53 2010 +0200

    Switch to dh+overrides

diff --git a/debian/control b/debian/control
index 2e54cc8..71f447e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Stéphane Glondu <glondu at debian.org>,
  Pietro Abate <pietro.abate at pps.jussieu.fr>
-Build-Depends: debhelper (>= 7),
+Build-Depends:
+ debhelper (>= 7.2.11~),
  dh-ocaml,
  ocaml-nox (>= 3.11.0),
  camlp4-extra,
diff --git a/debian/rules b/debian/rules
index ded3ce0..c758d22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,62 +16,32 @@ CONFIGURE_OPTS := --prefix=/usr \
   --with-expat \
   --without-pxp
 
-configure: configure-stamp
-configure-stamp: ocamlinit-stamp
-	dh_testdir
+%:
+	dh --with ocaml $@
+
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
 	tar -C debian -xjf /usr/src/ocaml-source-$(OCAML_ABI).tar.bz2
 	./configure  $(CONFIGURE_OPTS)
-	touch configure-stamp
 
-build: build-stamp
-build-stamp: configure-stamp
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 	$(MAKE) $(MAKE_OPTS) all doc
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
 
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
 	touch Makefile.conf
 	[ ! -f Makefile ] || $(MAKE) $(MAKE_OPTS) clean
 	-$(RM) Makefile.conf
 	-$(RM) -rf debian/ocaml-$(OCAML_ABI)/
-	dh_clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
 
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 	$(MAKE) $(MAKE_OPTS) DOCDIR=$(DOCDIR) BINDIR=$(BINDIR) MANDIR=$(MANDIR) OCAMLFIND_DESTDIR=$(LIBDIR) OCAMLFIND_LDCONF=ignore install
 
 	# Remove the wrong RPATH
 	chrpath -d $(BINDIR)/cduce
 
-	# CDuce Makefile installs all the documentation in DOCDIR, including 
+	# CDuce Makefile installs all the documentation in DOCDIR, including
 	# README, LICENSE, and so on. We don't want these. Let's hack.
 	find $(DOCDIR) -maxdepth 1 -not -name "*.html" -not -name "img" -exec rm {} \;
-
-binary: binary-arch
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAML_ABI)"
-	dh_md5sums
-	dh_builddeb
-
-.PHONY: configure build clean binary-indep binary-arch binary install

-- 
cduce packaging