[Pkg-ocaml-maint-commits] [SCM] ocaml-reins packaging branch, master, updated. debian/0.1a-1-11-gc47911d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 85c2fa00b231e5fcc0baa362ff3126405dd980c8
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 4 15:12:27 2009 +0200

    Use dh and bump debhelper compatibility level to 7

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 007ad69..ae5335e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,13 @@ Uploaders:
  Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
 Build-Depends:
- debhelper (>= 5),
- quilt,
+ debhelper (>= 7.0.52),
+ quilt (>= 0.46-7),
  ocaml-nox (>= 3.10.0),
  omake,
  libounit-ocaml-dev,
- ocaml-findlib
+ ocaml-findlib,
+ dh-ocaml
 Standards-Version: 3.7.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-reins.git
diff --git a/debian/rules b/debian/rules
index 5ccacba..dd59bd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,74 +1,29 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/ocaml/ocamlvars.mk
 
-PACKAGE=ocaml-reins
-include /usr/share/quilt/quilt.make
-OCAMLABI = $(shell ocamlc -version)
-OCAMLLIB = $(shell ocamlc -where)
-DEST = $(CURDIR)/debian/libreins-ocaml-dev/$(OCAMLLIB)
+DEST := $(CURDIR)/debian/libreins-ocaml-dev/$(OCAML_STDLIB_DIR)
 
-build: build-stamp
-
-build-stamp: patch
-	dh_testdir
+%:
+	dh --with quilt $@
 
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 	OCAMLFIND_DESTDIR=$(DEST) omake --config
-#	omake doc
-
-	touch $@
-
-clean: patch clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
 
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
 	omake clean
 	rm -f .omake*
 	find . -iname \*.omc -exec rm -f \{\} \;
 	find . -iname \*.annot -exec rm -f \{\} \;
 	rm -f doc/html/api/*
 
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 	OCAMLFIND_DESTDIR=$(DEST) omake install
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: override_dh_gencontrol
+override_dh_gencontrol:
+	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"

-- 
ocaml-reins packaging