[Pkg-ocaml-maint-commits] [SCM] ocaml-vorbis packaging branch, master, updated. debian/0.4.1-1-17-gd201319

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 653def0c3b677e258b450364ffd3b0c655aa7b22
Author: Samuel Mimram <smimram at debian.org>
Date:   Mon Feb 23 14:13:34 2009 +0100

    Use dh-ocaml's predefined variables.

diff --git a/debian/changelog b/debian/changelog
index 1e67a27..209f37b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ocaml-vorbis (0.5.0-1) UNRELEASED; urgency=low
 
   * New Upstream Version.
   * Switch packaging to git.
+  * Use dh-ocaml's predefined variables.
 
- -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 12:24:37 +0100
+ -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 14:12:55 +0100
 
 ocaml-vorbis (0.4.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 711514c..86c21cd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
-Build-Depends: debhelper (>> 4.0.0), dpkg-dev (>= 1.13.19), pkg-config, libvorbis-dev, ocaml-nox (>= 3.10), ocaml-findlib, libogg-ocaml-dev (>= 0.1.1-1)
+Build-Depends: debhelper (>> 4.0.0), dpkg-dev (>= 1.13.19), pkg-config, libvorbis-dev, dh-ocaml, ocaml-nox (>= 3.10), ocaml-findlib, libogg-ocaml-dev (>= 0.1.1-1)
 Standards-Version: 3.7.3
 Homepage: http://savonet.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-vorbis.git
diff --git a/debian/libvorbis-ocaml-dev.install.in b/debian/libvorbis-ocaml-dev.install.in
index 2ffd0e8..b199f28 100644
--- a/debian/libvorbis-ocaml-dev.install.in
+++ b/debian/libvorbis-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/vorbis/META
-usr/lib/ocaml/@OCamlABI@/vorbis/*.a
-usr/lib/ocaml/@OCamlABI@/vorbis/*.cm*
-usr/lib/ocaml/@OCamlABI@/vorbis/*.ml*
+ at OCamlStdlibDir@/vorbis/META
+ at OCamlStdlibDir@/vorbis/*.a
+ at OCamlStdlibDir@/vorbis/*.cm*
+ at OCamlStdlibDir@/vorbis/*.ml*
diff --git a/debian/libvorbis-ocaml.install.in b/debian/libvorbis-ocaml.install.in
index ba77113..b08a3e4 100644
--- a/debian/libvorbis-ocaml.install.in
+++ b/debian/libvorbis-ocaml.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/vorbis/dllvorbis_stubs.so	usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/vorbis/dllvorbis_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 44c5572..8c513ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 
-DESTDIR = $(CURDIR)/debian/tmp/$(shell ocamlc -where)
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 CFLAGS = -Wall -g -fPIC
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -20,9 +20,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
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
@@ -35,7 +32,7 @@ build-stamp: config.status
 
 	touch build-stamp
 
-clean:
+clean: ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -69,7 +66,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
 

-- 
ocaml-vorbis packaging