[Pkg-ocaml-maint-commits] [gmetadom] 02/06: Bump debhelper compat to 10 and switch 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 gmetadom.

commit 403c5747e9c52aa418c0c70a5e0117131bca1931
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Aug 8 11:26:31 2017 +0200

    Bump debhelper compat to 10 and switch to dh
---
 debian/compat                          |  2 +-
 debian/control                         |  4 +---
 debian/libgdome2-cpp-smart-dev.install | 10 +++++-----
 debian/libgdome2-cpp-smart0v5.install  |  2 +-
 debian/rules                           | 23 +++++++++++++----------
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 9a5cb33..c238695 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,11 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Build-Depends:
- debhelper (>= 7),
- dh-autoreconf,
+ debhelper (>= 10),
  ocaml-nox (>= 3.11),
  ocaml-findlib (>= 1.2.4),
  libgdome2-dev,
  pkg-config,
- cdbs,
  dh-ocaml (>= 0.9.1)
 Standards-Version: 3.8.3
 Homepage: http://gmetadom.sourceforge.net/
diff --git a/debian/libgdome2-cpp-smart-dev.install b/debian/libgdome2-cpp-smart-dev.install
index 11bd0fe..1e161b8 100644
--- a/debian/libgdome2-cpp-smart-dev.install
+++ b/debian/libgdome2-cpp-smart-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/gmetadom/gdome_cpp_smart/  usr/include/gmetadom/
-debian/tmp/usr/lib/*.a                            usr/lib/
-debian/tmp/usr/lib/*.la                           usr/lib/
-debian/tmp/usr/lib/*.so                           usr/lib/
-debian/tmp/usr/lib/pkgconfig/gdome2-cpp-smart.pc  usr/lib/pkgconfig
+usr/include/gmetadom/gdome_cpp_smart/
+usr/lib/*/*.a
+usr/lib/*/*.la
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/gdome2-cpp-smart.pc
diff --git a/debian/libgdome2-cpp-smart0v5.install b/debian/libgdome2-cpp-smart0v5.install
index b852b1c..3de3b10 100644
--- a/debian/libgdome2-cpp-smart0v5.install
+++ b/debian/libgdome2-cpp-smart0v5.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*.so.*       usr/lib/
+usr/lib/*/*.so.*
diff --git a/debian/rules b/debian/rules
index cbf2b0e..198e13d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,18 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --with-modules="gdome_cpp_smart gdome_caml"
-common-binary-post-install-arch::
-	-find debian/ -type f -size 0 -exec rm {} \;
-	-find debian/libgdome2-ocaml-dev -type d -name CVS -exec rm -rf {} \;
+%:
+	dh $@ --with ocaml
+
+override_dh_auto_configure:
+	dh_auto_configure -- --with-modules="gdome_cpp_smart gdome_caml"
 
-common-install-arch::
-	for file in debian/tmp/usr/lib/*.la; do \
+override_dh_auto_install:
+	dh_auto_install
+	for file in debian/tmp/usr/lib/*/*.la; do \
 		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
 	done
+
+override_dh_install:
+	dh_install
+	-find debian/ -type f -size 0 -exec rm {} \;
+	-find debian/libgdome2-ocaml-dev -type d -name CVS -exec rm -rf {} \;

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