[Pkg-ocaml-maint-commits] [SCM] ocaml-portaudio packaging branch, master, updated. debian/0.1.2-1-2-g27f44e3

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 27f44e37539f2edc251f0f7f097163923ac64ed6
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Wed Feb 25 22:45:42 2009 +0100

    Update package.

diff --git a/debian/changelog b/debian/changelog
index 1878c6f..fa89064 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-ocaml-portaudio (0.1.2-2) UNRELEASED; urgency=low
+ocaml-portaudio (0.1.2-2) unstable; urgency=low
 
-  * Switch packaging to git
+  * Rebuid with OCaml 3.11.
+  * Use dh-ocaml.
+  * Switch packaging to git.
+  * Update compat to 7.
+  * Update standards version to 3.8.0.
 
- -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 23:56:54 +0100
+ -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 22:44:00 +0100
 
 ocaml-portaudio (0.1.2-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index b818bf9..a22dde0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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 (>= 5.0.0), portaudio19-dev, ocaml-nox (>= 3.10), ocaml-findlib, pkg-config
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7), dh-ocaml, portaudio19-dev, ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), pkg-config
+Standards-Version: 3.8.0
 Homepage: http://savonet.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-portaudio.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-portaudio.git
@@ -15,7 +15,7 @@ Section: libs
 Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
 Description: OCaml bindings for the portaudio library
  Portaudio is a portable audio I/O library designed for cross-platform
- support of audio. This package provides O'Caml interface to this library.
+ support of audio. This package provides OCaml interface to this library.
  .
  This package contains only the shared runtime stub libraries.
 
@@ -25,7 +25,7 @@ Section: libdevel
 Depends: ocaml-nox-${F:OCamlABI}, portaudio19-dev, libportaudio-ocaml (= ${binary:Version}), ocaml-findlib
 Description: OCaml bindings for the portaudio library
  Portaudio is a portable audio I/O library designed for cross-platform
- support of audio. This package provides O'Caml interface to this library.
+ support of audio. This package provides OCaml interface to this library.
  .
  This package contains all the development stuff you need to develop
  OCaml programs which use portaudio.
diff --git a/debian/libportaudio-ocaml-dev.install.in b/debian/libportaudio-ocaml-dev.install.in
index 6337248..a288be6 100644
--- a/debian/libportaudio-ocaml-dev.install.in
+++ b/debian/libportaudio-ocaml-dev.install.in
@@ -1,3 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/portaudio/META
-usr/lib/ocaml/@OCamlABI@/portaudio/*.a
-usr/lib/ocaml/@OCamlABI@/portaudio/*.cm*
+ at OCamlStdlibDir@/portaudio/META
+ at OCamlStdlibDir@/portaudio/*.a
+ at OCamlStdlibDir@/portaudio/*.cm*
+ at OCamlStdlibDir@/portaudio/*.mli
diff --git a/debian/libportaudio-ocaml.install.in b/debian/libportaudio-ocaml.install.in
index 9088aaa..38e32e3 100644
--- a/debian/libportaudio-ocaml.install.in
+++ b/debian/libportaudio-ocaml.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/portaudio/dllportaudio_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/portaudio/dllportaudio_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 62d569e..d8cd87b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,16 +5,13 @@
 # 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 = -O2 -g -fPIC
 
-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
@@ -27,7 +24,7 @@ build-stamp: config.status
 
 	touch build-stamp
 
-clean:
+clean: ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -40,7 +37,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	mkdir -p $(DESTDIR)
@@ -53,7 +50,7 @@ binary-arch: build install
 	dh_installchangelogs CHANGES
 	dh_installdocs
 	dh_installexamples
-	dh_install --sourcedir=debian/tmp --list-missing
+	dh_install --list-missing
 	dh_link
 	dh_strip
 	dh_compress
@@ -61,7 +58,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-portaudio packaging