[Pkg-ocaml-maint-commits] [extlib] 01/06: switch to dh style debian/rules

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch master
in repository extlib.

commit 410a2a11d2a3b42265e28f45fbea1a8391a2265e
Author: Johannes Schauer <josch at debian.org>
Date:   Sun Aug 30 12:31:32 2015 +0200

    switch to dh style debian/rules
---
 debian/changelog |  7 +++++++
 debian/compat    |  2 +-
 debian/control   |  3 +--
 debian/rules     | 27 +++++++++++----------------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6025f9d..6f7264c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+extlib (1.6.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * switch to dh style debian/rules
+
+ -- Johannes Schauer <josch at debian.org>  Sun, 30 Aug 2015 12:29:32 +0200
+
 extlib (1.6.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 3a770bf..6aa17df 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,10 @@ Uploaders:
  Stéphane Glondu <glondu at debian.org>,
  Lifeng Sun <lifongsun at gmail.com>
 Build-Depends:
+ debhelper (>= 9),
  ocaml-nox (>= 4.00.1),
  camlp4-extra,
  ocaml-findlib (>= 1.3.2),
- debhelper (>= 8),
- cdbs,
  dh-ocaml (>= 0.9)
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/extlib.git
diff --git a/debian/rules b/debian/rules
index eb1d69a..59ebfd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,15 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
-PKGNAME = libextlib-ocaml-dev
-OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
+include /usr/share/ocaml/ocamlvars.mk
+
 PKGDIR = $(CURDIR)/debian/tmp
-DESTDIR = $(PKGDIR)$(OCAML_STDLIB_DIR)/extlib
-DOCDIR = $(PKGDIR)/usr/share/doc/$(PKGNAME)/
+export OCAMLFIND_DESTDIR = $(PKGDIR)$(OCAML_STDLIB_DIR)
+
+%:
+	dh $@ --with ocaml
 
-common-build-arch::
-	mkdir -p $(DESTDIR)/ $(DOCDIR)/
-	if [ -x /usr/bin/ocamlopt ]; then \
-		ocaml install.ml -d $(DESTDIR)/ -b -n -nodoc -full; \
-		ocamlopt -shared -linkall -o $(DESTDIR)/extLib.cmxs -I $(DESTDIR) $(DESTDIR)/extLib.cmxa; \
-	else \
-		ocaml install.ml -d $(DESTDIR)/ -b -nodoc -full; \
-	fi
-	cp -a extLib.ml *.mli $(DESTDIR)/
-	cp -a META $(DESTDIR)/META
+override_dh_auto_install:
+	# if we do not create this directory manually beforehand, `ocamlfind install` will exit with:
+	# ocamlfind: Bad configuration: Cannot mkdir [...] because a path component does not exist or is not a directory
+	mkdir -p $(OCAMLFIND_DESTDIR)
+	dh_auto_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/extlib.git