[Pkg-ocaml-maint-commits] [ocamlgsl] 04/15: Convert to dh 7 style

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository ocamlgsl.

commit b5e0d77f150d52b96fab116f0143942a31f27d5c
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 17 14:51:50 2016 +0100

    Convert to dh 7 style
---
 debian/compat  |  2 +-
 debian/control |  4 ++--
 debian/rules   | 43 +++++++++++++++----------------------------
 3 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index a3fd6a0..f0269d3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: ocamlgsl
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), 
- debhelper (>= 5), 
+Build-Depends:
+ debhelper (>= 9),
  ocaml-nox (>= 3.10.0-9), 
  ocaml-findlib (>= 1.1.2pl1-4), 
  libgsl-dev,
diff --git a/debian/rules b/debian/rules
index fe9e584..5413c37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,13 @@
 #!/usr/bin/make -f
-# debian/rules for ocamlgsl package
-# Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
-DEB_MAKE_CLEAN_TARGET    := clean
+
+%:
+	dh $@ --with ocaml
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	-mv .depend.save .depend
+	dh_auto_clean
+
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET    := all-opt
 DEB_MAKE_INSTALL_TARGET  := install-opt
@@ -38,13 +24,14 @@ DESTDIR := $(CURDIR)/debian/$(PACKAGE)
 
 DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
 
-pre-build::
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 	cp .depend .depend.save
+	$(MAKE) $(DEB_MAKE_BUILD_TARGET)
 
-clean::
-	-mv .depend.save .depend
-
-install/libocamlgsl-ocaml-dev::
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	$(MAKE) $(DEB_MAKE_INSTALL_TARGET)
 	$(RM) -r '$(DESTDIR_DEV)/$(OCAML_DLL_DIR)'
 	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gsl/*.so \
 	 '$(DESTDIR)/$(OCAML_DLL_DIR)'

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