[Pkg-ocaml-maint-commits] [xstr] 07/08: Switch debian/rules to dh

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository xstr.

commit 7c6526dbe2b5e2705c21ed686e45676845cfc45f
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Aug 8 17:51:59 2017 +0200

    Switch debian/rules to dh
---
 debian/control |  1 -
 debian/rules   | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 28dcc7b..7fba7d8 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Build-Depends:
  debhelper (>= 10),
  ocaml-nox (>= 3.11),
  ocaml-findlib (>= 1.2.4),
- cdbs,
  dh-ocaml (>= 0.9.1)
 Standards-Version: 4.0.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/xstr.git
diff --git a/debian/rules b/debian/rules
index 39c275e..9349285 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,17 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+
+include /usr/share/ocaml/ocamlvars.mk
 
 PKGNAME = libxstr-ocaml-dev
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/$(PKGNAME)/$(OCAML_STDLIB_DIR)
 
+%:
+	dh $@ --with ocaml
+
+override_dh_auto_build:
+	dh_auto_build
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-build/$(PKGNAME)::
 	$(MAKE) opt
 endif
-build/$(PKGNAME)::
-	chmod +x $(CURDIR)/debian/expand_stars.sh
+
+override_dh_auto_install:
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/$(PKGNAME)/$(OCAML_STDLIB_DIR)

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