[Pkg-ocaml-maint-commits] [SCM] mysql-ocaml packaging branch, master, updated. debian/1.0.4-5

[Samuel Mimram]

The following commit has been merged in the master branch:
commit eb53fe78ad6d400e6663e3ad9fab4aa747ebfec2
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Thu Feb 19 18:35:46 2009 +0100

    Use dh-ocaml predefined variables.

diff --git a/debian/changelog b/debian/changelog
index 2abf63a..34f83f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,10 +8,11 @@ mysql-ocaml (1.0.4-5) UNRELEASED; urgency=low
 
   [ Samuel Mimram ]
   * Switch packaging to git.
+  * Use dh-ocaml predefined variables.
   * Update compat to 7.
   * Update standards version to 3.8.0.
 
- -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 18:31:17 +0100
+ -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 18:35:13 +0100
 
 mysql-ocaml (1.0.4-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b4e7135..9afb319 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mysql-ocaml
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 7), libmysqlclient15-dev, ocaml-nox (>= 3.09.1), camlp4, ocaml-findlib, dpatch
+Build-Depends: debhelper (>= 7), libmysqlclient15-dev, dh-ocaml (>= 0.2), ocaml-nox (>= 3.09.1), camlp4, ocaml-findlib, dpatch
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mysql-ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mysql-ocaml.git
diff --git a/debian/libmysql-ocaml-dev.install.in b/debian/libmysql-ocaml-dev.install.in
index e27e827..7d75657 100644
--- a/debian/libmysql-ocaml-dev.install.in
+++ b/debian/libmysql-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/mysql/META
-usr/lib/ocaml/@OCamlABI@/mysql/*.a
-usr/lib/ocaml/@OCamlABI@/mysql/*.cm*
-usr/lib/ocaml/@OCamlABI@/mysql/*.ml*
+ at OCamlStdlibDir@/mysql/META
+ at OCamlStdlibDir@/mysql/*.a
+ at OCamlStdlibDir@/mysql/*.cm*
+ at OCamlStdlibDir@/mysql/*.ml*
diff --git a/debian/libmysql-ocaml.install.in b/debian/libmysql-ocaml.install.in
index 729c388..315a36b 100644
--- a/debian/libmysql-ocaml.install.in
+++ b/debian/libmysql-ocaml.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/mysql/dllmysql_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/mysql/dllmysql_stubs.so    @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 2b110d8..172c101 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,10 @@
 
 # We want to use dpatch
 include /usr/share/dpatch/dpatch.make
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-
-OCAML_LIB_DIR = $(shell ocamlc -where)
-DESTDIR = $(CURDIR)/debian/tmp$(OCAML_LIB_DIR)
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
 CFLAGS = -Wall -g -fPIC
 
@@ -23,9 +21,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
         INSTALL_PROGRAM += -s
 endif
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
 config.status: configure
 	dh_testdir
 	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
@@ -40,7 +35,7 @@ build-stamp: config.status
 
 	touch build-stamp
 
-clean: unpatch
+clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -78,7 +73,7 @@ binary-arch: build install
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums
 	dh_builddeb
 

-- 
mysql-ocaml packaging