[Pkg-ocaml-maint-commits] [SCM] cairo-ocaml packaging branch, master, updated. debian/20090223-1-13-g46caeca

[Stephane Glondu]

The following commit has been merged in the master branch:
commit ac7f70227dc7a9bb0a0ffe8f10a3095782e4eddf
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Nov 3 18:01:34 2009 +0100

    Switch to dh with overrides

diff --git a/debian/control b/debian/control
index 7278fee..1794613 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Samuel Mimram <smimram at debian.org>,
  Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 7.0.50~),
  automake1.9,
  autoconf,
  ocaml-findlib (>= 1.2.4),
diff --git a/debian/rules b/debian/rules
index 5170d1a..0e3ea24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,69 +20,37 @@ orig-tarball:
 	tar zcvf cairo-ocaml_$(NOW).orig.tar.gz cairo-ocaml-$(NOW)
 	rm -rf cairo-ocaml-$(NOW)
 
-configure:
+%:
+	dh $@
+
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
 	aclocal -I support
 	autoconf
-
-config.status: configure
-	dh_testdir
 	chmod +x configure
 	./configure --with-gtk
 
-build: ocamlinit build-stamp
-build-stamp: config.status
-	dh_testdir
-
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 	$(MAKE) all
 ifneq ($(OCAML_OPT_ARCH),)
 	$(MAKE) opt
 endif
 	$(MAKE) doc
 
-	touch build-stamp
-
-clean: ocamlinit-clean
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
 	[ ! -f config.make ] || $(MAKE) clean
 	$(RM) -f aclocal.m4 config.{log,make,status} configure
 	$(RM) -rf doc
 
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 	mkdir -p $(DESTDIR)
 	$(MAKE) install DESTDIR=$(DESTDIR)
 	mkdir -p debian/libcairo-ocaml-dev/$(OCAML_STDLIB_DIR)/cairo/
 	cp debian/META debian/libcairo-ocaml-dev/$(OCAML_STDLIB_DIR)/cairo/
 
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_install --sourcedir=debian/tmp --list-missing
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
+.PHONY: override_dh_gencontrol
+override_dh_gencontrol:
 	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit

-- 
cairo-ocaml packaging